* [PATCH 2/2] sg: handle class_device_create failure properly
@ 2008-01-15 4:18 FUJITA Tomonori
2008-01-15 4:55 ` Douglas Gilbert
0 siblings, 1 reply; 2+ messages in thread
From: FUJITA Tomonori @ 2008-01-15 4:18 UTC (permalink / raw)
To: dougg; +Cc: James.Bottomley, mdr, linux-scsi, tomof
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 2/2] sg: handle class_device_create failure properly
2008-01-15 4:18 [PATCH 2/2] sg: handle class_device_create failure properly FUJITA Tomonori
@ 2008-01-15 4:55 ` Douglas Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Douglas Gilbert @ 2008-01-15 4:55 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: James.Bottomley, mdr, linux-scsi, tomof
FUJITA Tomonori wrote:
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> ---
> 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 <dougg@torque.net>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-15 4:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-15 4:18 [PATCH 2/2] sg: handle class_device_create failure properly FUJITA Tomonori
2008-01-15 4:55 ` Douglas Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).