diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-07-19 23:45:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:52:28 -0400 |
commit | 85ec9d7193a0d98e1c2af78d3a2110dd96c6cf02 (patch) | |
tree | 2d2df4df2f5660594b0aea42a01ee30e899859b9 | |
parent | 2750d9c3afe7c4b9a21993d79fe31b8d44bde5bd (diff) |
[media] dib7000p: setup dev.parent for i2c master built into 7000p
We need to set the dev.parent member on the dib7000p on its i2c master, or
else calls to request_firmware() will hit an oops in 2.6.31.
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/frontends/dib7000p.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 0c9f40c2a251..a64a538ba364 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -2336,6 +2336,11 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, | |||
2336 | request_firmware() will hit an OOPS (this should be moved somewhere | 2336 | request_firmware() will hit an OOPS (this should be moved somewhere |
2337 | more common) */ | 2337 | more common) */ |
2338 | 2338 | ||
2339 | /* FIXME: make sure the dev.parent field is initialized, or else | ||
2340 | request_firmware() will hit an OOPS (this should be moved somewhere | ||
2341 | more common) */ | ||
2342 | st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; | ||
2343 | |||
2339 | dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); | 2344 | dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); |
2340 | 2345 | ||
2341 | /* init 7090 tuner adapter */ | 2346 | /* init 7090 tuner adapter */ |