Re: [PATCH 2/2] sg: handle class_device_create failure properly

[Douglas Gilbert]

FUJITA Tomonori wrote:

Signed-off-by: FUJITA Tomonori <[EMAIL PROTECTED]>
---
 drivers/scsi/sg.c |   11 +++
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 92b4367..527e2eb 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1430,11 +1430,14 @@ sg_add(struct class_device *cl_dev, struct 
class_interface *cl_intf)
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
cl_dev->dev, "%s",
disk->disk_name);
-   if (IS_ERR(sg_class_member))
-   printk(KERN_WARNING "sg_add: "
-   "class_device_create failed\n");
+   if (IS_ERR(sg_class_member)) {
+   printk(KERN_ERR "sg_add: "
+  "class_device_create failed\n");
+   error = PTR_ERR(sg_class_member);
+   goto cdev_add_err;
+   }
class_set_devdata(sg_class_member, sdp);
-		error = sysfs_create_link(&scsidp->sdev_gendev.kobj, 
+		error = sysfs_create_link(&scsidp->sdev_gendev.kobj,

  &sg_class_member->kobj, "generic");
if (error)
printk(KERN_ERR "sg_add: unable to make symlink "


Signed-off-by: Douglas Gilbert <[EMAIL PROTECTED]>

-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] sg: handle class_device_create failure properly

[FUJITA Tomonori]

Signed-off-by: FUJITA Tomonori <[EMAIL PROTECTED]>
---
 drivers/scsi/sg.c |   11 +++
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 92b4367..527e2eb 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1430,11 +1430,14 @@ sg_add(struct class_device *cl_dev, struct 
class_interface *cl_intf)
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
cl_dev->dev, "%s",
disk->disk_name);
-   if (IS_ERR(sg_class_member))
-   printk(KERN_WARNING "sg_add: "
-   "class_device_create failed\n");
+   if (IS_ERR(sg_class_member)) {
+   printk(KERN_ERR "sg_add: "
+  "class_device_create failed\n");
+   error = PTR_ERR(sg_class_member);
+   goto cdev_add_err;
+   }
class_set_devdata(sg_class_member, sdp);
-   error = sysfs_create_link(&scsidp->sdev_gendev.kobj, 
+   error = sysfs_create_link(&scsidp->sdev_gendev.kobj,
  &sg_class_member->kobj, "generic");
if (error)
printk(KERN_ERR "sg_add: unable to make symlink "
-- 
1.5.3.4

-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html