From: Gianluca Gennari Date: Thu, 12 Apr 2012 11:46:51 +0000 (-0300) Subject: [media] dib7000p: remove duplicate code and comment X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a00f559c9fd3e2c2262a9fae9a64c8f34d9bc720;p=linux-beck.git [media] dib7000p: remove duplicate code and comment Remove duplicate code and comment, probably due to a patch applied twice. Signed-off-by: Gianluca Gennari Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 5ceadc285b3a..3e1eefada0e8 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c @@ -2396,11 +2396,6 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, more common) */ st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; - /* 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 */