diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 09:55:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 09:55:19 -0800 |
| commit | c22cff08db00ef0411be088956d7934681a1f988 (patch) | |
| tree | 74f601d0843e8f367002146a39bedb03b79384ad /drivers/media/dvb/frontends/dibx000_common.c | |
| parent | 6b4e81db2552bad04100e7d5ddeed7e848f53b48 (diff) | |
| parent | 6b101926f98b54549128db4d34f4a73b5f03fecc (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] soc-camera: Compile fixes for mx2-camera
[media] SoC Camera: ov6650: minor cleanups
[media] SOC Camera: OMAP1: typo fix
[media] SoC Camera: OMAP1: update for recent videobuf changes
[media] SoC Camera: OMAP1: update for recent framework changes
[media] ARM mx3_camera: check for DMA engine type
[media] tm6000: bugfix set tv standards
[media] cafe_ccic: fix subdev configuration
[media] saa7134: Fix autodetect for Behold A7 and H7 TV cards
[media] v4l: kill the BKL
[media] BZ#22292: dibx000_common: Restore i2c algo pointer
Diffstat (limited to 'drivers/media/dvb/frontends/dibx000_common.c')
| -rw-r--r-- | drivers/media/dvb/frontends/dibx000_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c index a4991026254..2311c0a3406 100644 --- a/drivers/media/dvb/frontends/dibx000_common.c +++ b/drivers/media/dvb/frontends/dibx000_common.c @@ -130,6 +130,7 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct dibx000_i2c_master *mst) { strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); + i2c_adap->algo = algo; i2c_adap->algo_data = NULL; i2c_set_adapdata(i2c_adap, mst); if (i2c_add_adapter(i2c_adap) < 0) |