projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e148a5
)
media: dw2102: Dont't list TT Cinergy S2 R4 twice
author
Michael Bunk
<micha@freedict.org>
Sun, 16 Jan 2022 11:22:37 +0000
(12:22 +0100)
committer
Mauro Carvalho Chehab
<mchehab@kernel.org>
Mon, 29 Apr 2024 08:48:08 +0000
(09:48 +0100)
"modinfo dvb-usb-dw2102|grep 0105" returns two lines, because the module
reports this usb alias twice.
Remove one of them.
Signed-off-by: Michael Bunk <micha@freedict.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/usb/dvb-usb/dw2102.c
patch
|
blob
|
history
diff --git
a/drivers/media/usb/dvb-usb/dw2102.c
b/drivers/media/usb/dvb-usb/dw2102.c
index 10351308b0d028b744b009f66b5b0734aabcb318..598185c516fa6b6d9b1298a740a0dafdf054f763 100644
(file)
--- a/
drivers/media/usb/dvb-usb/dw2102.c
+++ b/
drivers/media/usb/dvb-usb/dw2102.c
@@
-1833,7
+1833,6
@@
enum dw2102_table_entry {
TECHNOTREND_CONNECT_S2_4600,
TEVII_S482_1,
TEVII_S482_2,
- TERRATEC_CINERGY_S2_BOX,
TEVII_S662
};
@@
-1866,7
+1865,6
@@
static struct usb_device_id dw2102_table[] = {
DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_4600),
DVB_USB_DEV(TEVII, TEVII_S482_1),
DVB_USB_DEV(TEVII, TEVII_S482_2),
- DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_BOX),
DVB_USB_DEV(TEVII, TEVII_S662),
{ }
};
@@
-2577,7
+2575,7
@@
static struct dvb_usb_device_properties tt_s2_4600_properties = {
{ NULL },
},
{ "Terratec Cinergy S2 USB BOX",
- { &dw2102_table[TERRATEC_CINERGY_S2_
BOX
], NULL },
+ { &dw2102_table[TERRATEC_CINERGY_S2_
R4
], NULL },
{ NULL },
},
{ "TeVii S662",