V4L/DVB (8975): af9015: cleanup

- cleanup Telestar Starstick 2 patch

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 505432b10b8d5a0e28068ad16a2cab7e479f6892..f962d89db1340bb28ecbf46abd705f9c2108f262 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1196,7 +1196,7 @@ static struct usb_device_id af9015_usb_table[] = {
 /* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
        {USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGIVOX_DUO)},
        {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
-       {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR)},
+       {USB_DEVICE(USB_VID_TELESTAR,  USB_PID_TELESTAR_STARSTICK_2)},
        {0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1365,7 +1365,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                .warm_ids = {NULL},
                        },
                        {
-                               .name = "Telestar USB DVB-T",
+                               .name = "Telestar Starstick 2",
                                .cold_ids = {&af9015_usb_table[13], NULL},
                                .warm_ids = {NULL},
                        },

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 60c241e0236f678151f450b074d7b0487139eda3..66dc000d4e4938fc90921028c4734e3737643f73 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -225,6 +225,6 @@
 #define USB_PID_YUAN_EC372S                            0x1edc
 #define USB_PID_DW2102                                 0x2102
 #define USB_PID_XTENSIONS_XD_380                       0x0381
-#define USB_PID_TELESTAR                               0x8000
+#define USB_PID_TELESTAR_STARSTICK_2                   0x8000
 
 #endif