diff --git a/[refs] b/[refs]
index 604a9eeeeead..ddc17378649b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce07c7b61e74af35a05060a2d6341f68fd92c9e
+refs/heads/master: db176c6ed8974fae94328ad5ac9e70b094ff22fd
diff --git a/trunk/drivers/base/sys.c b/trunk/drivers/base/sys.c
index 4fbb56bcb1ee..358bb0be3c08 100644
--- a/trunk/drivers/base/sys.c
+++ b/trunk/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);