diff --git a/[refs] b/[refs]
index 636df99fe7c9..8353862cc028 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 801c73c04ad57689dc9b47baf62cbb23f954d987
+refs/heads/master: b395cbac36e58a55729fe7e6262a3f0b1691bced
diff --git a/trunk/drivers/media/rc/lirc_dev.c b/trunk/drivers/media/rc/lirc_dev.c
index 6b9fc74f2e1d..fd237ab120bb 100644
--- a/trunk/drivers/media/rc/lirc_dev.c
+++ b/trunk/drivers/media/rc/lirc_dev.c
@@ -178,7 +178,9 @@ static int lirc_cdev_add(struct irctl *ir)
 		cdev_init(cdev, &lirc_dev_fops);
 		cdev->owner = THIS_MODULE;
 	}
-	kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
+	retval = kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
+	if (retval)
+		return retval;
 
 	retval = cdev_add(cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
 	if (retval)