Merge branch 'master' into for-next
[linux-2.6.git] / drivers / char / bsr.c
index 7fef305..89d871e 100644 (file)
@@ -253,7 +253,7 @@ static int bsr_add_node(struct device_node *bn)
 
                cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
                                                cur, cur->bsr_name);
-               if (!cur->bsr_device) {
+               if (IS_ERR(cur->bsr_device)) {
                        printk(KERN_ERR "device_create failed for %s\n",
                               cur->bsr_name);
                        cdev_del(&cur->bsr_cdev);