提交 bac2dacd 编写于 作者: I Igor M. Liplianin 提交者: Mauro Carvalho Chehab

[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: NIgor M. Liplianin <liplianin@me.by>
Acked-by: André Weidemann<Andre.Weidemann@web.de>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 f1a84c9b
...@@ -1012,7 +1012,7 @@ static struct dvb_usb_device_properties tt_connect_s2_3600_properties = { ...@@ -1012,7 +1012,7 @@ static struct dvb_usb_device_properties tt_connect_s2_3600_properties = {
.i2c_algo = &pctv452e_i2c_algo, .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, .num_device_descs = 2,
.devices = { .devices = {
...@@ -1055,22 +1055,9 @@ static struct usb_driver pctv452e_usb_driver = { ...@@ -1055,22 +1055,9 @@ static struct usb_driver pctv452e_usb_driver = {
.id_table = pctv452e_usb_table, .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) static int __init pctv452e_usb_init(void)
{ {
int ret = usb_register(&pctv452e_usb_driver); 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) if (ret)
err("%s: usb_register failed! Error %d", __FILE__, ret); err("%s: usb_register failed! Error %d", __FILE__, ret);
...@@ -1080,7 +1067,6 @@ static int __init pctv452e_usb_init(void) ...@@ -1080,7 +1067,6 @@ static int __init pctv452e_usb_init(void)
static void __exit pctv452e_usb_exit(void) static void __exit pctv452e_usb_exit(void)
{ {
usb_deregister(&pctv452e_usb_driver); usb_deregister(&pctv452e_usb_driver);
usb_deregister(&tt_connects2_3600_usb_driver);
} }
module_init(pctv452e_usb_init); module_init(pctv452e_usb_init);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册