summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx/cx231xx-input.c
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2014-10-02 07:20:59 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-30 20:18:22 +0100
commitc3c3f1ae8bab74c99fa211c76b035a41523e83dd (patch)
tree3acfa168d161401c8004de2767fa52711380c1f9 /drivers/media/usb/cx231xx/cx231xx-input.c
parent[media] cx231xx: Use symbolic constants for i2c ports instead of numbers (diff)
downloadlinux-c3c3f1ae8bab74c99fa211c76b035a41523e83dd.tar.xz
linux-c3c3f1ae8bab74c99fa211c76b035a41523e83dd.zip
[media] cx231xx: add wrapper to get the i2c_adapter pointer
This is a preparation for mapping I2C_1_MUX_1 and I2C_1_MUX_3 later to the seperate muxed i2c adapters. Map mux adapters to I2C_1 for now. Add local variables for i2c_adapters in dvb_init to get line lengths shorter. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Reviewed-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx-input.c')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-input.c b/drivers/media/usb/cx231xx/cx231xx-input.c
index 05f0434919d4..5ae2ce3f51b1 100644
--- a/drivers/media/usb/cx231xx/cx231xx-input.c
+++ b/drivers/media/usb/cx231xx/cx231xx-input.c
@@ -100,7 +100,8 @@ int cx231xx_ir_init(struct cx231xx *dev)
ir_i2c_bus = cx231xx_boards[dev->model].ir_i2c_master;
dev_dbg(&dev->udev->dev, "Trying to bind ir at bus %d, addr 0x%02x\n",
ir_i2c_bus, info.addr);
- dev->ir_i2c_client = i2c_new_device(&dev->i2c_bus[ir_i2c_bus].i2c_adap, &info);
+ dev->ir_i2c_client = i2c_new_device(
+ cx231xx_get_i2c_adap(dev, ir_i2c_bus), &info);
return 0;
}