From: Malcolm Priestley Date: Tue, 3 Jan 2012 09:27:06 +0000 (-0300) Subject: [media] it913x ver 1.22 corrections to Tuner IDs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=245900c4a7a7d23c2e5b2b64b70770debcac5814;p=linux-beck.git [media] it913x ver 1.22 corrections to Tuner IDs Correction to tuner ID 0x51. Don't force tuner ID 0x60 unless eprom data zero. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c index 21b7478ca7dc..eb6a1bb6bffc 100644 --- a/drivers/media/dvb/dvb-usb/it913x.c +++ b/drivers/media/dvb/dvb-usb/it913x.c @@ -397,7 +397,8 @@ static int ite_firmware_select(struct usb_device *udev, else if (le16_to_cpu(udev->descriptor.idProduct) == USB_PID_ITETECH_IT9135_9006) { sw = IT9135_V2_FW; - it913x_config.tuner_id_0 = 0x60; + if (it913x_config.tuner_id_0 == 0) + it913x_config.tuner_id_0 = IT9135_60; } else sw = IT9137_FW; @@ -836,5 +837,5 @@ module_exit(it913x_module_exit); MODULE_AUTHOR("Malcolm Priestley "); MODULE_DESCRIPTION("it913x USB 2 Driver"); -MODULE_VERSION("1.21"); +MODULE_VERSION("1.22"); MODULE_LICENSE("GPL"); diff --git a/drivers/media/dvb/frontends/it913x-fe.h b/drivers/media/dvb/frontends/it913x-fe.h index 4143ef9c4fab..5ee3e2f14165 100644 --- a/drivers/media/dvb/frontends/it913x-fe.h +++ b/drivers/media/dvb/frontends/it913x-fe.h @@ -161,7 +161,7 @@ static inline struct dvb_frontend *it913x_fe_attach( /* Build in tuner types */ #define IT9137 0x38 #define IT9135_38 0x38 -#define IT9135_51 0x50 +#define IT9135_51 0x51 #define IT9135_52 0x52 #define IT9135_60 0x60 #define IT9135_61 0x61