aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_sysfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
-rw-r--r--drivers/scsi/scsi_sysfs.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 429c9b73e3e4..c23ab978c3ba 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -474,7 +474,7 @@ static DEVICE_ATTR(field, S_IRUGO, sdev_show_##field, NULL);
474 474
475 475
476/* 476/*
477 * sdev_rd_attr: create a function and attribute variable for a 477 * sdev_rw_attr: create a function and attribute variable for a
478 * read/write field. 478 * read/write field.
479 */ 479 */
480#define sdev_rw_attr(field, format_string) \ 480#define sdev_rw_attr(field, format_string) \
@@ -486,7 +486,7 @@ sdev_store_##field (struct device *dev, struct device_attribute *attr, \
486{ \ 486{ \
487 struct scsi_device *sdev; \ 487 struct scsi_device *sdev; \
488 sdev = to_scsi_device(dev); \ 488 sdev = to_scsi_device(dev); \
489 snscanf (buf, 20, format_string, &sdev->field); \ 489 sscanf (buf, format_string, &sdev->field); \
490 return count; \ 490 return count; \
491} \ 491} \
492static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field); 492static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field);
@@ -853,9 +853,6 @@ static int scsi_target_add(struct scsi_target *starget)
853 error = device_add(&starget->dev); 853 error = device_add(&starget->dev);
854 if (error) { 854 if (error) {
855 dev_err(&starget->dev, "target device_add failed, error %d\n", error); 855 dev_err(&starget->dev, "target device_add failed, error %d\n", error);
856 get_device(&starget->dev);
857 scsi_target_reap(starget);
858 put_device(&starget->dev);
859 return error; 856 return error;
860 } 857 }
861 transport_add_device(&starget->dev); 858 transport_add_device(&starget->dev);