From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sun, 9 Feb 2014 13:02:49 +0000 (-0300)
Subject: [media] af9035: add default 0x9135 slave I2C address
X-Git-Tag: v3.15-rc1~85^2~369
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a1310ff4c438bbdbd76dda5cbc27cc108d08d1c1;p=~emulex%2Finfiniband.git

[media] af9035: add default 0x9135 slave I2C address

On some devices the vendor has not set EEPROM_2ND_DEMOD_ADDR.

Checks tmp is not zero after call to get EEPROM_2ND_DEMOD_ADDR and sets the
default slave address of 0x3a on 0x9135 devices.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 3825c2f2f99..4f682ad97bc 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -576,6 +576,10 @@ static int af9035_download_firmware(struct dvb_usb_device *d,
 			goto err;
 
 		if (state->chip_type == 0x9135) {
+			if (!tmp)
+				/* default 0x9135 slave I2C address */
+				tmp = 0x3a;
+
 			ret = af9035_wr_reg(d, 0x004bfb, tmp);
 			if (ret < 0)
 				goto err;
@@ -684,6 +688,10 @@ static int af9035_read_config(struct dvb_usb_device *d)
 		if (ret < 0)
 			goto err;
 
+		if (!tmp && state->chip_type == 0x9135)
+			/* default 0x9135 slave I2C address */
+			tmp = 0x3a;
+
 		state->af9033_config[1].i2c_addr = tmp;
 		dev_dbg(&d->udev->dev, "%s: 2nd demod I2C addr=%02x\n",
 				__func__, tmp);