diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
| commit | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (patch) | |
| tree | 5c66ddaf0a6ab6d898931a5ed58c7aa844b94740 /drivers/base/sys.c | |
| parent | 7022b15e2a9f878fd5184586064c63352c3dd225 (diff) | |
| parent | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/base/sys.c')
| -rw-r--r-- | drivers/base/sys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 4fbb56bcb1ee..358bb0be3c08 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -175,8 +175,7 @@ int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv) } /* Check whether this driver has already been added to a class. */ - if ((drv->entry.next != drv->entry.prev) || - (drv->entry.next != NULL)) { + if (drv->entry.next && !list_empty(&drv->entry)) { printk(KERN_WARNING "sysdev: class %s: driver (%p) has already" " been registered to a class, something is wrong, but " "will forge on!\n", cls->name, drv); |