Merge ../scsi-rc-fixes-2.6

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index b32b77ff2dcd..0ff267a248db 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -562,7 +562,10 @@ int class_device_add(struct class_device *class_dev)
                 goto out2;
 
         /* add the needed attributes to this device */
-        sysfs_create_link(&class_dev->kobj, &parent_class->subsys.kset.kobj, "subsystem");
+        error = sysfs_create_link(&class_dev->kobj,
+                                  &parent_class->subsys.kset.kobj, "subsystem");
+        if (error)
+                goto out3;
         class_dev->uevent_attr.attr.name = "uevent";
         class_dev->uevent_attr.attr.mode = S_IWUSR;
         class_dev->uevent_attr.attr.owner = parent_class->owner;