1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 5a065055e68a..19ec9e2d3f39 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -847,6 +847,8 @@ static int scsi_target_add(struct scsi_target *starget)
         if (starget->state != STARGET_CREATED)
                 return 0;
 
+        device_enable_async_suspend(&starget->dev);
+
         error = device_add(&starget->dev);
         if (error) {
                 dev_err(&starget->dev, "target device_add failed, error %d\n", error);
@@ -878,7 +880,8 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
         struct request_queue *rq = sdev->request_queue;
         struct scsi_target *starget = sdev->sdev_target;
 
-        if ((error = scsi_device_set_state(sdev, SDEV_RUNNING)) != 0)
+        error = scsi_device_set_state(sdev, SDEV_RUNNING);
+        if (error)
                 return error;
 
         error = scsi_target_add(starget);
@@ -886,16 +889,18 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
                 return error;
 
         transport_configure_device(&starget->dev);
+        device_enable_async_suspend(&sdev->sdev_gendev);
         error = device_add(&sdev->sdev_gendev);
         if (error) {
                 printk(KERN_INFO "error 1\n");
-                goto out_remove;
+                return error;
         }
+        device_enable_async_suspend(&sdev->sdev_dev);
         error = device_add(&sdev->sdev_dev);
         if (error) {
                 printk(KERN_INFO "error 2\n");
                 device_del(&sdev->sdev_gendev);
-                goto out_remove;
+                return error;
         }
         transport_add_device(&sdev->sdev_gendev);
         sdev->is_visible = 1;
@@ -910,14 +915,14 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
         else
                 error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_depth);
         if (error)
-                goto out_remove;
+                return error;
 
         if (sdev->host->hostt->change_queue_type)
                 error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_type_rw);
         else
                 error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_type);
         if (error)
-                goto out_remove;
+                return error;
 
         error = bsg_register_queue(rq, &sdev->sdev_gendev, NULL, NULL);
 
@@ -933,16 +938,11 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
                         error = device_create_file(&sdev->sdev_gendev,
                                         sdev->host->hostt->sdev_attrs[i]);
                         if (error)
-                                goto out_remove;
+                                return error;
                 }
         }
 
-        return 0;
-
- out_remove:
-        __scsi_remove_device(sdev);
         return error;
-
 }
 
 void __scsi_remove_device(struct scsi_device *sdev)