summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-07-07 03:19:20 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-07 03:19:20 (GMT)
commitb7e386360922a15f943b2fbe8d77a19bb86f2e6f (patch)
treefe0b93cfd27f50a1c127f5135c5c567a33e866c0 /drivers
parent563cd5cec48b1cad04397a13dec0a2ab666ea95c (diff)
downloadlinux-b7e386360922a15f943b2fbe8d77a19bb86f2e6f.tar.xz
media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
This reverts commit 03228792df67a6ae231960151b8a5c87e17a73e2. drivers/media/dvb/dvb-usb/dw2102.c:1478:18: error: ‘USB_PID_TEVII_S421’ undeclared here (not in a function) drivers/media/dvb/dvb-usb/dw2102.c:1479:18: error: ‘USB_PID_TEVII_S632’ undeclared here (not in a function) Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/dw2102.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index 7c37a56..9382895 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -1182,13 +1182,6 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
err("command 0x0e transfer failed.");
obuf[0] = 0xe;
- obuf[1] = 0x02;
- obuf[2] = 1;
-
- if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
- err("command 0x0e transfer failed.");
-
- obuf[0] = 0xe;
obuf[1] = 0x83;
obuf[2] = 0;
@@ -1454,9 +1447,6 @@ enum dw2102_table_entry {
TEVII_S480_1,
TEVII_S480_2,
X3M_SPC1400HD,
- TEVII_S421,
- TEVII_S632,
- TERRATEC_CINERGY_S2_R2,
};
static struct usb_device_id dw2102_table[] = {
@@ -1475,9 +1465,6 @@ static struct usb_device_id dw2102_table[] = {
[TEVII_S480_1] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},
[TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
[X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
- [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
- [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
- [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)},
{ }
};
@@ -1866,7 +1853,7 @@ static struct dvb_usb_device_properties su3000_properties = {
}},
}
},
- .num_device_descs = 4,
+ .num_device_descs = 3,
.devices = {
{ "SU3000HD DVB-S USB2.0",
{ &dw2102_table[GENIATECH_SU3000], NULL },
@@ -1880,10 +1867,6 @@ static struct dvb_usb_device_properties su3000_properties = {
{ &dw2102_table[X3M_SPC1400HD], NULL },
{ NULL },
},
- { "Terratec Cinergy S2 USB HD Rev.2",
- { &dw2102_table[TERRATEC_CINERGY_S2_R2], NULL },
- { NULL },
- },
}
};