Skip to content

Commit

Permalink
[media] pctv452e: Remove bogus code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Igor M. Liplianin authored and Mauro Carvalho Chehab committed Oct 19, 2011
1 parent f1a84c9 commit bac2dac
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions drivers/media/dvb/dvb-usb/pctv452e.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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);

Expand All @@ -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);
Expand Down

0 comments on commit bac2dac

Please sign in to comment.