aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-11-05 07:35:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-11-08 22:32:09 -0200
commit2c2742da1e590f426e8d85ce4e33b69142245fb8 (patch)
tree1ea700c5bcec6c9ba7099ebb54360f0371936ae5 /drivers/media
parentc8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff)
downloadmrst-s0i3-test-2c2742da1e590f426e8d85ce4e33b69142245fb8.tar.gz
mrst-s0i3-test-2c2742da1e590f426e8d85ce4e33b69142245fb8.tar.xz
mrst-s0i3-test-2c2742da1e590f426e8d85ce4e33b69142245fb8.zip
[media] BZ#22292: dibx000_common: Restore i2c algo pointer
Commit a90f933507859941c4a58028d7593a80f57895c4 accidentally removed the piece of code setting the i2c algo pointer. Restore it. That's what happens when you put two code statements on the same line... Signed-off-by: Jean Delvare <khali@linux-fr.org> Tested by: Chris Clayton <chris2553@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/dibx000_common.c1
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)