aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2011-10-06 04:15:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-19 06:04:06 -0400
commitbac2dacd5fb9ddad093d7a2dc5ab44e764874821 (patch)
tree1b90615cbde40aae1d3aab18735f7f47992338ff
parentf1a84c9b0a962a940a1f8b9202d84842e54e8d7c (diff)
[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>
-rw-r--r--drivers/media/dvb/dvb-usb/pctv452e.c16
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 9a5c81112807..f9aec5cb6e77 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 = {
1012 1012
1013 .i2c_algo = &pctv452e_i2c_algo, 1013 .i2c_algo = &pctv452e_i2c_algo,
1014 1014
1015 .generic_bulk_ctrl_endpoint = 1, /* allow generice rw function*/ 1015 .generic_bulk_ctrl_endpoint = 1, /* allow generic rw function*/
1016 1016
1017 .num_device_descs = 2, 1017 .num_device_descs = 2,
1018 .devices = { 1018 .devices = {
@@ -1055,22 +1055,9 @@ static struct usb_driver pctv452e_usb_driver = {
1055 .id_table = pctv452e_usb_table, 1055 .id_table = pctv452e_usb_table,
1056}; 1056};
1057 1057
1058static struct usb_driver tt_connects2_3600_usb_driver = {
1059 .name = "dvb-usb-tt-connect-s2-3600-01.fw",
1060 .probe = pctv452e_usb_probe,
1061 .disconnect = pctv452e_usb_disconnect,
1062 .id_table = pctv452e_usb_table,
1063};
1064
1065static int __init pctv452e_usb_init(void) 1058static int __init pctv452e_usb_init(void)
1066{ 1059{
1067 int ret = usb_register(&pctv452e_usb_driver); 1060 int ret = usb_register(&pctv452e_usb_driver);
1068
1069 if (ret) {
1070 err("%s: usb_register failed! Error %d", __FILE__, ret);
1071 return ret;
1072 }
1073 ret = usb_register(&tt_connects2_3600_usb_driver);
1074 if (ret) 1061 if (ret)
1075 err("%s: usb_register failed! Error %d", __FILE__, ret); 1062 err("%s: usb_register failed! Error %d", __FILE__, ret);
1076 1063
@@ -1080,7 +1067,6 @@ static int __init pctv452e_usb_init(void)
1080static void __exit pctv452e_usb_exit(void) 1067static void __exit pctv452e_usb_exit(void)
1081{ 1068{
1082 usb_deregister(&pctv452e_usb_driver); 1069 usb_deregister(&pctv452e_usb_driver);
1083 usb_deregister(&tt_connects2_3600_usb_driver);
1084} 1070}
1085 1071
1086module_init(pctv452e_usb_init); 1072module_init(pctv452e_usb_init);