1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 9ad41168d26d..b333389f248f 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1030,11 +1030,20 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
                                 "failed to add device: %d\n", error);
                 return error;
         }
+
+        error = scsi_dh_add_device(sdev);
+        if (error) {
+                sdev_printk(KERN_INFO, sdev,
+                                "failed to add device handler: %d\n", error);
+                return error;
+        }
+
         device_enable_async_suspend(&sdev->sdev_dev);
         error = device_add(&sdev->sdev_dev);
         if (error) {
                 sdev_printk(KERN_INFO, sdev,
                                 "failed to add class device: %d\n", error);
+                scsi_dh_remove_device(sdev);
                 device_del(&sdev->sdev_gendev);
                 return error;
         }
@@ -1074,6 +1083,7 @@ void __scsi_remove_device(struct scsi_device *sdev)
                 bsg_unregister_queue(sdev->request_queue);
                 device_unregister(&sdev->sdev_dev);
                 transport_remove_device(dev);
+                scsi_dh_remove_device(sdev);
                 device_del(dev);
         } else
                 put_device(&sdev->sdev_dev);