Commit f6618cc8 authored by Brad Love's avatar Brad Love Committed by Mauro Carvalho Chehab

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 94448e21 ("media: lgdt3306a: Fix a double kfree on i2c
  device remove")
- commit 835d6617 ("media: lgdt3306a: Fix module count mismatch
  on usb unplug")

The symbol count mismatch is handled by:
- commit 5b3a8e90 ("media: lgdt3306a: Set fe ops.release to
  NULL if probed")
Signed-off-by: default avatarBrad Love <brad@nextdimension.cc>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 60d0bbec
...@@ -1814,12 +1814,6 @@ static void lgdt3306a_release(struct dvb_frontend *fe) ...@@ -1814,12 +1814,6 @@ 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");
/*
* If state->muxc is not NULL, then we are an i2c device
* and lgdt3306a_remove will clean up state
*/
if (!state->muxc)
kfree(state); kfree(state);
} }
...@@ -2221,7 +2215,7 @@ static int lgdt3306a_probe(struct i2c_client *client, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment