summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-12-27 22:19:31 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:04:29 -0200
commitb00fff0be5655614bb18a4b1d6e33b27c56c6f7e (patch)
tree39847384116482dc8067238ce7ac3d970cb47850
parent68370cf94e2511aeda3b7cb8490692570a8c9dab (diff)
downloadop-kernel-dev-b00fff0be5655614bb18a4b1d6e33b27c56c6f7e.zip
op-kernel-dev-b00fff0be5655614bb18a4b1d6e33b27c56c6f7e.tar.gz
V4L/DVB (6935): cx23885: add missing subsystem IDs for Hauppauge HVR1500 Retail
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.cx238854
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 302c84f..0924e6e 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -3,5 +3,5 @@
2 -> Hauppauge WinTV-HVR1800 [0070:7800,0070:7801,0070:7809]
3 -> Hauppauge WinTV-HVR1250 [0070:7911]
4 -> DViCO FusionHDTV5 Express [18ac:d500]
- 5 -> Hauppauge WinTV-HVR1500Q [0070:7797]
- 6 -> Hauppauge WinTV-HVR1500 [0070:7717]
+ 5 -> Hauppauge WinTV-HVR1500Q [0070:7790,0070:7797]
+ 6 -> Hauppauge WinTV-HVR1500 [0070:7710,0070:7717]
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 4068695..82af448 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -158,10 +158,18 @@ struct cx23885_subid cx23885_subids[] = {
.card = CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP,
},{
.subvendor = 0x0070,
+ .subdevice = 0x7790,
+ .card = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
+ },{
+ .subvendor = 0x0070,
.subdevice = 0x7797,
.card = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
},{
.subvendor = 0x0070,
+ .subdevice = 0x7710,
+ .card = CX23885_BOARD_HAUPPAUGE_HVR1500,
+ },{
+ .subvendor = 0x0070,
.subdevice = 0x7717,
.card = CX23885_BOARD_HAUPPAUGE_HVR1500,
},
OpenPOWER on IntegriCloud