patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / base / class.c

diff --git a/drivers/base/class.c b/drivers/base/class.c
index b9fdce4..ed13d9d 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -361,6 +361,8 @@ void class_device_unregister(struct class_device *class_dev)
 
 int class_device_rename(struct class_device *class_dev, char *new_name)
 {
+       int error = 0;
+
        class_dev = class_device_get(class_dev);
        if (!class_dev)
                return -EINVAL;
@@ -370,11 +372,11 @@ int class_device_rename(struct class_device *class_dev, char *new_name)
 
        strlcpy(class_dev->class_id, new_name, KOBJ_NAME_LEN);
 
-       kobject_rename(&class_dev->kobj, new_name);
+       error = kobject_rename(&class_dev->kobj, new_name);
 
        class_device_put(class_dev);
 
-       return 0;
+       return error;
 }
 
 struct class_device * class_device_get(struct class_device *class_dev)