Skip to content

Commit d07e036

Browse files
fujitaJames Bottomley
authored andcommitted
[SCSI] sg: handle class_device_create failure properly
Signed-off-by: FUJITA Tomonori <[email protected]> Acked-by: Douglas Gilbert <[email protected]> Signed-off-by: James Bottomley <[email protected]>
1 parent a24484f commit d07e036

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

drivers/scsi/sg.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,11 +1434,14 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
14341434
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
14351435
cl_dev->dev, "%s",
14361436
disk->disk_name);
1437-
if (IS_ERR(sg_class_member))
1438-
printk(KERN_WARNING "sg_add: "
1439-
"class_device_create failed\n");
1437+
if (IS_ERR(sg_class_member)) {
1438+
printk(KERN_ERR "sg_add: "
1439+
"class_device_create failed\n");
1440+
error = PTR_ERR(sg_class_member);
1441+
goto cdev_add_err;
1442+
}
14401443
class_set_devdata(sg_class_member, sdp);
1441-
error = sysfs_create_link(&scsidp->sdev_gendev.kobj,
1444+
error = sysfs_create_link(&scsidp->sdev_gendev.kobj,
14421445
&sg_class_member->kobj, "generic");
14431446
if (error)
14441447
printk(KERN_ERR "sg_add: unable to make symlink "

0 commit comments

Comments
 (0)