From: Devin Heitmueller Date: Mon, 20 Jul 2009 03:45:25 +0000 (-0300) Subject: [media] dib7000p: setup dev.parent for i2c master built into 7000p X-Git-Tag: MMI-PSA29.97-13-9~18729^2~388 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=85ec9d7193a0d98e1c2af78d3a2110dd96c6cf02;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab --- 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, 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 */