diff options
author | Brad Love <brad@nextdimension.cc> | 2018-03-06 14:14:55 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-03-07 03:58:48 -0500 |
commit | f6618cc8b447834a8102ae6988ae45cc7835a519 (patch) | |
tree | 4c01dfc2db20c4ea4f97c93b82615977cb871ca3 /drivers/media | |
parent | 60d0bbec5965590d72b1a2091ec7a2cc589cb8e0 (diff) | |
download | op-kernel-dev-f6618cc8b447834a8102ae6988ae45cc7835a519.zip op-kernel-dev-f6618cc8b447834a8102ae6988ae45cc7835a519.tar.gz |
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 94448e21cf08 ("media: lgdt3306a: Fix a double kfree on i2c
device remove")
- commit 835d66173a38 ("media: lgdt3306a: Fix module count mismatch
on usb unplug")
The symbol count mismatch is handled by:
- commit 5b3a8e906973 ("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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb-frontends/lgdt3306a.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c index 5b19033..7eb4e14 100644 --- a/drivers/media/dvb-frontends/lgdt3306a.c +++ b/drivers/media/dvb-frontends/lgdt3306a.c @@ -1814,13 +1814,7 @@ static void lgdt3306a_release(struct dvb_frontend *fe) struct lgdt3306a_state *state = fe->demodulator_priv; 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); } static const struct dvb_frontend_ops lgdt3306a_ops; @@ -2221,7 +2215,7 @@ static int lgdt3306a_probe(struct i2c_client *client, sizeof(struct lgdt3306a_config)); config->i2c_addr = client->addr; - fe = dvb_attach(lgdt3306a_attach, config, client->adapter); + fe = lgdt3306a_attach(config, client->adapter); if (fe == NULL) { ret = -ENODEV; goto err_fe; |