From 4a94265450c13af167a5f04e48ac7d382a25ce20 Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Thu, 6 Oct 2011 05:15:22 -0300 Subject: [PATCH] --- yaml --- r: 271982 b: refs/heads/master c: bac2dacd5fb9ddad093d7a2dc5ab44e764874821 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/pctv452e.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 7327c0fa2fd7..eda7f8726915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a84c9b0a962a940a1f8b9202d84842e54e8d7c +refs/heads/master: bac2dacd5fb9ddad093d7a2dc5ab44e764874821 diff --git a/trunk/drivers/media/dvb/dvb-usb/pctv452e.c b/trunk/drivers/media/dvb/dvb-usb/pctv452e.c index 9a5c81112807..f9aec5cb6e77 100644 --- a/trunk/drivers/media/dvb/dvb-usb/pctv452e.c +++ b/trunk/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);