1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 859f870552e3..5e083d1f57e7 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -193,6 +193,12 @@ dcssblk_segment_warn(int rc, char* seg_name)
         }
 }
 
+static void dcssblk_unregister_callback(struct device *dev)
+{
+        device_unregister(dev);
+        put_device(dev);
+}
+
 /*
  * device attribute for switching shared/nonshared (exclusive)
  * operation (show + store)
@@ -276,8 +282,7 @@ removeseg:
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
-        device_unregister(dev);
-        put_device(dev);
+        rc = device_schedule_callback(dev, dcssblk_unregister_callback);
 out:
         up_write(&dcssblk_devices_sem);
         return rc;