aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-08-09 13:16:29 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 16:25:33 -0400
commitb619ff7ab484ace964b97dacc7e6c78c0e6228aa (patch)
treed3551e8c7a345e2a9222cf8c2a692c069c4dae9c
parent9e0a976ed60345d53e8d421cb0a39202ce8487fe (diff)
[media] af9035: remove AVerMedia eeprom override
Reverts commit 3ab25123373270152a9fae98e3c48ef1b2a878c0 [media] af9035: override tuner for AVerMedia A835B devices Original commit itself is correct, but it was replaced by more general solution (commit 1cbbf90d0406913ad4b44194b07f4f41bde84e54). This old solution was committed by a accident and is not needed anymore. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/usb/dvb-usb-v2/af9035.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 8ac0423c70d5..85f2c4bdef98 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -802,25 +802,6 @@ static int af9035_read_config(struct dvb_usb_device *d)
802 addr += 0x10; /* shift for the 2nd tuner params */ 802 addr += 0x10; /* shift for the 2nd tuner params */
803 } 803 }
804 804
805 /*
806 * These AVerMedia devices has a bad EEPROM content :-(
807 * Override some wrong values here.
808 */
809 if (le16_to_cpu(d->udev->descriptor.idVendor) == USB_VID_AVERMEDIA) {
810 switch (le16_to_cpu(d->udev->descriptor.idProduct)) {
811 case USB_PID_AVERMEDIA_A835B_1835:
812 case USB_PID_AVERMEDIA_A835B_2835:
813 case USB_PID_AVERMEDIA_A835B_3835:
814 dev_info(&d->udev->dev,
815 "%s: overriding tuner from %02x to %02x\n",
816 KBUILD_MODNAME, state->af9033_config[0].tuner,
817 AF9033_TUNER_IT9135_60);
818
819 state->af9033_config[0].tuner = AF9033_TUNER_IT9135_60;
820 break;
821 }
822 }
823
824skip_eeprom: 805skip_eeprom:
825 /* get demod clock */ 806 /* get demod clock */
826 ret = af9035_rd_reg(d, 0x00d800, &tmp); 807 ret = af9035_rd_reg(d, 0x00d800, &tmp);