diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-05-06 16:56:14 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-05-06 16:56:14 -0700 |
| commit | 11a50240f7f468b2a769b093e8c8341ab0c6e526 (patch) | |
| tree | 26a088f14998f10f59d47ce013c7dc2959219dc8 | |
| parent | 363704d53733c9e4b39840dbe7bedb49a24addb0 (diff) | |
| download | mediapointer-dvb-s2-11a50240f7f468b2a769b093e8c8341ab0c6e526.tar.gz mediapointer-dvb-s2-11a50240f7f468b2a769b093e8c8341ab0c6e526.tar.bz2 | |
dvb-core: Handle failures to create devices
From: Simon Arlott <simon@fire.lp0.eu>
dvb-core is not started early enough when device drivers that use dvb are
compiled in so dvb_register_device fails (silently) since dvb_class is
NULL, this runs dvb_init using subsys_initcall instead of module_init.
dvb_register_device will now check the return value of class_device_create.
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 17104fb4b..e785a773e 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -211,7 +211,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, { struct dvb_device *dvbdev; struct file_operations *dvbdevfops; - + struct class_device *clsdev; int id; mutex_lock(&dvbdev_register_lock); @@ -253,8 +253,15 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, mutex_unlock(&dvbdev_register_lock); - class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), - adap->device, "dvb%d.%s%d", adap->num, dnames[type], id); + clsdev = class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, + nums2minor(adap->num, type, id)), + adap->device, "dvb%d.%s%d", adap->num, + dnames[type], id); + if (IS_ERR(clsdev)) { + printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n", + __FUNCTION__, adap->num, dnames[type], id, PTR_ERR(clsdev)); + return PTR_ERR(clsdev); + } dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n", adap->num, dnames[type], id, nums2minor(adap->num, type, id), @@ -442,7 +449,7 @@ static void __exit exit_dvbdev(void) unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); } -module_init(init_dvbdev); +subsys_initcall(init_dvbdev); module_exit(exit_dvbdev); MODULE_DESCRIPTION("DVB Core Driver"); |