hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: lgdt3306a: remove symbol count mismatch fix 

This symbol mismatch is handled by NULL'ing out the release
callback if the driver is loaded as an i2c device.

This patch reverts:
- commit 94448e21cf ("media: lgdt3306a: Fix a double kfree on i2c
  device remove")
- commit 835d66173a ("media: lgdt3306a: Fix module count mismatch
  on usb unplug")

The symbol count mismatch is handled by:
- commit 5b3a8e9069 ("media: lgdt3306a: Set fe ops.release to
  NULL if probed")

Signed-off-by: Brad Love <brad@nextdimension.cc>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Brad Love 2018-03-06 14:14:55 -05:00 committed by Mauro Carvalho Chehab
parent 60d0bbec59
commit f6618cc8b4
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/dvb-frontends/lgdt3306a.c
View File

@ -1814,13 +1814,7 @@ static void lgdt3306a_release(struct dvb_frontend *fe)
struct lgdt3306a_state *state = fe->demodulator_priv; struct lgdt3306a_state *state = fe->demodulator_priv;
dbg_info("\n"); dbg_info("\n");
kfree(state);
/*
* If state->muxc is not NULL, then we are an i2c device
* and lgdt3306a_remove will clean up state
*/
if (!state->muxc)
kfree(state);
} }
static const struct dvb_frontend_ops lgdt3306a_ops; static const struct dvb_frontend_ops lgdt3306a_ops;
@ -2221,7 +2215,7 @@ static int lgdt3306a_probe(struct i2c_client *client,
sizeof(struct lgdt3306a_config)); sizeof(struct lgdt3306a_config));
config->i2c_addr = client->addr; config->i2c_addr = client->addr;
fe = dvb_attach(lgdt3306a_attach, config, client->adapter); fe = lgdt3306a_attach(config, client->adapter);
if (fe == NULL) { if (fe == NULL) {
ret = -ENODEV; ret = -ENODEV;
goto err_fe; goto err_fe;