aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/lirc_dev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 11:10:16 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 11:10:16 (GMT)
commit3c91560bf96a1f7ad39131e7730fd319647ff734 (patch)
treec48b8d3f06af2f6ed04efc916b1624892ccc543b /drivers/media/rc/lirc_dev.c
parentaf4c52a75b2ffd0ad7514acc681759d2e44a5d46 (diff)
parentdedb94adebe0fbdd9cafdbb170337810d8638bc9 (diff)
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork: [media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changes [media] timblogiw: const and __devinitdata do not mix [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor [media] gspca core: Fix regressions gspca breaking devices with audio [media] gspca/sn9c20x: Get rid of scale "magic" numbers [media] gspca/sn9c20x: Test if sensor is a OV sensor [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick [media] media: Remove unnecessary casts of usb_get_intfdata [media] Terratec Cinergy Hybrid T USB XS [media] media: rc: lirc_dev: check kobject_set_name() result [media] rc-core: add loopback driver
Diffstat (limited to 'drivers/media/rc/lirc_dev.c')
-rw-r--r--drivers/media/rc/lirc_dev.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 6b9fc74..fd237ab 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/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)

Privacy Policy