projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 1847b43c GKH |
1 | From a24bc323eb07e2a3a751e23c172b68d1b239db67 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Till=20D=C3=B6rges?= <till@doerges.net> | |
| 3 | Date: Tue, 11 Feb 2014 17:27:57 -0300 | |
| 4 | Subject: [media] rtl28xxu: add ID [0ccd:00b4] TerraTec NOXON DAB Stick (rev 3) | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | From: =?UTF-8?q?Till=20D=C3=B6rges?= <till@doerges.net> | |
| 10 | ||
| 11 | commit a24bc323eb07e2a3a751e23c172b68d1b239db67 upstream. | |
| 12 | ||
| 13 | I've got the following DAB USB stick that also works fine with the | |
| 14 | DVB_USB_RTL28XXU driver after I added its USB ID: | |
| 15 | Bus 001 Device 009: ID 0ccd:00b4 TerraTec Electronic GmbH | |
| 16 | ||
| 17 | [crope@iki.fi: apply patch partly manually] | |
| 18 | Signed-off-by: Till Dörges <till@doerges.net> | |
| 19 | Signed-off-by: Antti Palosaari <crope@iki.fi> | |
| 20 | Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> | |
| 21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 22 | ||
| 23 | --- | |
| 24 | drivers/media/dvb-core/dvb-usb-ids.h | 1 + | |
| 25 | drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 ++ | |
| 26 | 2 files changed, 3 insertions(+) | |
| 27 | ||
| 28 | --- a/drivers/media/dvb-core/dvb-usb-ids.h | |
| 29 | +++ b/drivers/media/dvb-core/dvb-usb-ids.h | |
| 30 | @@ -257,6 +257,7 @@ | |
| 31 | #define USB_PID_TERRATEC_T5 0x10a1 | |
| 32 | #define USB_PID_NOXON_DAB_STICK 0x00b3 | |
| 33 | #define USB_PID_NOXON_DAB_STICK_REV2 0x00e0 | |
| 34 | +#define USB_PID_NOXON_DAB_STICK_REV3 0x00b4 | |
| 35 | #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e | |
| 36 | #define USB_PID_PINNACLE_PCTV2000E 0x022c | |
| 37 | #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228 | |
| 38 | --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c | |
| 39 | +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c | |
| 40 | @@ -1401,6 +1401,8 @@ static const struct usb_device_id rtl28x | |
| 41 | &rtl2832u_props, "TerraTec NOXON DAB Stick", NULL) }, | |
| 42 | { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK_REV2, | |
| 43 | &rtl2832u_props, "TerraTec NOXON DAB Stick (rev 2)", NULL) }, | |
| 44 | + { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK_REV3, | |
| 45 | + &rtl2832u_props, "TerraTec NOXON DAB Stick (rev 3)", NULL) }, | |
| 46 | { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_TREKSTOR_TERRES_2_0, | |
| 47 | &rtl2832u_props, "Trekstor DVB-T Stick Terres 2.0", NULL) }, | |
| 48 | { DVB_USB_DEVICE(USB_VID_DEXATEK, 0x1101, |