git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
base
/
class.c
diff --git
a/drivers/base/class.c
b/drivers/base/class.c
index
2693bb5
..
70be974
100644
(file)
--- a/
drivers/base/class.c
+++ b/
drivers/base/class.c
@@
-349,14
+349,19
@@
void class_device_initialize(struct class_device *class_dev)
int class_device_add(struct class_device *class_dev)
{
int class_device_add(struct class_device *class_dev)
{
- struct class * parent;
+ struct class * parent
= NULL
;
struct class_interface * class_intf;
int error;
class_dev = class_device_get(class_dev);
struct class_interface * class_intf;
int error;
class_dev = class_device_get(class_dev);
- if (!class_dev
|| !strlen(class_dev->class_id)
)
+ if (!class_dev)
return -EINVAL;
return -EINVAL;
+ if (!strlen(class_dev->class_id)) {
+ error = -EINVAL;
+ goto register_done;
+ }
+
parent = class_get(class_dev->class);
pr_debug("CLASS: registering class device: ID = '%s'\n",
parent = class_get(class_dev->class);
pr_debug("CLASS: registering class device: ID = '%s'\n",