diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-26 20:38:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:41 -0200 |
| commit | a6f6fb9c86aa202cbc04796efe9187b698b9b225 (patch) | |
| tree | 7ef56f8db0d7525ee367bad7ccca9fa6f2c63b2b /drivers/media/video/cx231xx/cx231xx-core.c | |
| parent | 1a4aa920d0b49af2c0d9bbedb3bb75be4e174218 (diff) | |
| download | kernel_samsung_smdk4412-a6f6fb9c86aa202cbc04796efe9187b698b9b225.zip kernel_samsung_smdk4412-a6f6fb9c86aa202cbc04796efe9187b698b9b225.tar.gz kernel_samsung_smdk4412-a6f6fb9c86aa202cbc04796efe9187b698b9b225.tar.bz2 | |
[media] cx231xx: better handle the master port enable command
Improves the logic, for it to be clearer and to avoid having
board-dependent config there.
Acked-by: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-core.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index 983b120..4af46fc 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c @@ -1401,9 +1401,7 @@ int cx231xx_dev_init(struct cx231xx *dev) cx231xx_set_alt_setting(dev, INDEX_TS1, 0); /* set the I2C master port to 3 on channel 1 */ - if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER && - dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2) - errCode = cx231xx_enable_i2c_for_tuner(dev, I2C_3); + errCode = cx231xx_enable_i2c_port_3(dev, true); return errCode; } |