The condition to check the cdev pointer validity on css_sch_device_unregister() is a leftover from the 'commit c97cd8c81d4a ("s390/cio: Remove pm support from ccw bus driver")'. This could lead to a situation, where detaching the disk is not happening completely. Remove this invalid condition in the IO_SCH_UNREG case. Fixes: 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver") Reported-by: Christian Ehrhardt <christian.ehrhardt@xxxxxxxxxxxxx> Suggested-by: Christian Ehrhardt <christian.ehrhardt@xxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> Signed-off-by: Vineeth Vijayan <vneethv@xxxxxxxxxxxxx> --- drivers/s390/cio/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 3f026021e95e..84f659cafe76 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1532,8 +1532,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process) switch (action) { case IO_SCH_ORPH_UNREG: case IO_SCH_UNREG: - if (!cdev) - css_sch_device_unregister(sch); + css_sch_device_unregister(sch); break; case IO_SCH_ORPH_ATTACH: case IO_SCH_UNREG_ATTACH: -- 2.25.1