From b263a432f99efcd8337214b8a7db1d07ab4b3060 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 20 Jul 2009 00:45:25 -0300 Subject: [PATCH] --- yaml --- r: 261221 b: refs/heads/master c: 85ec9d7193a0d98e1c2af78d3a2110dd96c6cf02 h: refs/heads/master i: 261219: 622df4dae93e7e20554e124c68bc40b48d696fb8 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/dib7000p.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 77b7dc98f110..ab3e34b6df02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2750d9c3afe7c4b9a21993d79fe31b8d44bde5bd +refs/heads/master: 85ec9d7193a0d98e1c2af78d3a2110dd96c6cf02 diff --git a/trunk/drivers/media/dvb/frontends/dib7000p.c b/trunk/drivers/media/dvb/frontends/dib7000p.c index 0c9f40c2a251..a64a538ba364 100644 --- a/trunk/drivers/media/dvb/frontends/dib7000p.c +++ b/trunk/drivers/media/dvb/frontends/dib7000p.c @@ -2336,6 +2336,11 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, request_firmware() will hit an OOPS (this should be moved somewhere more common) */ + /* FIXME: make sure the dev.parent field is initialized, or else + request_firmware() will hit an OOPS (this should be moved somewhere + more common) */ + st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; + dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); /* init 7090 tuner adapter */