diff options
| author | Mauro Carvalho Chehab | 2011-07-09 17:36:58 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-07-27 22:55:48 +0200 |
| commit | 0fc55e81d3364e6535cacb10b5a579f8c62625b1 (patch) | |
| tree | 28e84110be681bd247568f70a71a406254a54675 /drivers/media/dvb/ngene | |
| parent | [media] drxk: remove _0 from read/write routines (diff) | |
| download | kernel-qcow2-linux-0fc55e81d3364e6535cacb10b5a579f8c62625b1.tar.gz kernel-qcow2-linux-0fc55e81d3364e6535cacb10b5a579f8c62625b1.tar.xz kernel-qcow2-linux-0fc55e81d3364e6535cacb10b5a579f8c62625b1.zip | |
[media] drxk: Move I2C address into a config structure
Currently, the only parameter to be configured is the I2C
address. However, Terratec H5 logs shows that it needs a different
setting for some things, and it has its own firmware.
So, move the addr into a config structure, in order to allow adding
the required configuration bits.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene')
| -rw-r--r-- | drivers/media/dvb/ngene/ngene-cards.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c index 9f72dd8e9fbd..056419228363 100644 --- a/drivers/media/dvb/ngene/ngene-cards.c +++ b/drivers/media/dvb/ngene/ngene-cards.c @@ -213,9 +213,12 @@ static int port_has_drxk(struct i2c_adapter *i2c, int port) static int demod_attach_drxk(struct ngene_channel *chan, struct i2c_adapter *i2c) { - chan->fe = dvb_attach(drxk_attach, - i2c, 0x29 + (chan->number^2), - &chan->fe2); + struct drxk_config config; + + memset(&config, 0, sizeof(config)); + config.adr = 0x29 + (chan->number ^ 2); + + chan->fe = dvb_attach(drxk_attach, &config, i2c, &chan->fe2); if (!chan->fe) { printk(KERN_ERR "No DRXK found!\n"); return -ENODEV; |