diff options
| author | Igor M. Liplianin <liplianin@me.by> | 2011-10-06 05:15:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-19 08:04:06 -0200 |
| commit | bac2dacd5fb9ddad093d7a2dc5ab44e764874821 (patch) | |
| tree | 1b90615cbde40aae1d3aab18735f7f47992338ff /drivers/media/dvb/dvb-usb | |
| parent | f1a84c9b0a962a940a1f8b9202d84842e54e8d7c (diff) | |
| download | kernel_samsung_smdk4412-bac2dacd5fb9ddad093d7a2dc5ab44e764874821.zip kernel_samsung_smdk4412-bac2dacd5fb9ddad093d7a2dc5ab44e764874821.tar.gz kernel_samsung_smdk4412-bac2dacd5fb9ddad093d7a2dc5ab44e764874821.tar.bz2 | |
[media] pctv452e: Remove bogus code
Currently, usb_register calls two times with cloned structures, but for
different driver names. Let's remove it.
Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Acked-by: André Weidemann<Andre.Weidemann@web.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/pctv452e.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/dvb/dvb-usb/pctv452e.c index 9a5c811..f9aec5c 100644 --- a/drivers/media/dvb/dvb-usb/pctv452e.c +++ b/drivers/media/dvb/dvb-usb/pctv452e.c @@ -1012,7 +1012,7 @@ static struct dvb_usb_device_properties tt_connect_s2_3600_properties = { .i2c_algo = &pctv452e_i2c_algo, - .generic_bulk_ctrl_endpoint = 1, /* allow generice rw function*/ + .generic_bulk_ctrl_endpoint = 1, /* allow generic rw function*/ .num_device_descs = 2, .devices = { @@ -1055,22 +1055,9 @@ static struct usb_driver pctv452e_usb_driver = { .id_table = pctv452e_usb_table, }; -static struct usb_driver tt_connects2_3600_usb_driver = { - .name = "dvb-usb-tt-connect-s2-3600-01.fw", - .probe = pctv452e_usb_probe, - .disconnect = pctv452e_usb_disconnect, - .id_table = pctv452e_usb_table, -}; - static int __init pctv452e_usb_init(void) { int ret = usb_register(&pctv452e_usb_driver); - - if (ret) { - err("%s: usb_register failed! Error %d", __FILE__, ret); - return ret; - } - ret = usb_register(&tt_connects2_3600_usb_driver); if (ret) err("%s: usb_register failed! Error %d", __FILE__, ret); @@ -1080,7 +1067,6 @@ static int __init pctv452e_usb_init(void) static void __exit pctv452e_usb_exit(void) { usb_deregister(&pctv452e_usb_driver); - usb_deregister(&tt_connects2_3600_usb_driver); } module_init(pctv452e_usb_init); |