1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index e1d96344d733..f1b7fdc58a5f 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3042,12 +3042,15 @@ void dasd_generic_remove(struct ccw_device *cdev)
         cdev->handler = NULL;
 
         device = dasd_device_from_cdev(cdev);
-        if (IS_ERR(device))
+        if (IS_ERR(device)) {
+                dasd_remove_sysfs_files(cdev);
                 return;
+        }
         if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags) &&
             !test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
                 /* Already doing offline processing */
                 dasd_put_device(device);
+                dasd_remove_sysfs_files(cdev);
                 return;
         }
         /*