summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorErnst Martin Witte <emw-linux-kernel@nocabal.de>2016-01-09 18:18:44 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-01 09:42:30 -0200
commit41ff9142df375ac319b1d9fe50d88e4247da6f1a (patch)
tree1b3f077f251bdb021377ed8aa65af49ca102edf0 /drivers/media
parent4fd57ed61564bd4706e71cfd8c5a259079ddabf3 (diff)
[media] ts2020: cancel_delayed_work_sync before device removal / kfree
ts2020_remove was calling kfree(dev) with possibly still active schedule_delayed_work(dev->stat_work). A similar bug in si2157 caused kernel panics in call_timer_fn e.g. after rmmod cx23885. Signed-off-by: Ernst Martin Witte <emw-linux-kernel@nocabal.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-frontends/ts2020.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 7979e5d6498b..14b410ffe612 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -712,6 +712,10 @@ static int ts2020_remove(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
+ /* stop statistics polling */
+ if (!dev->dont_poll)
+ cancel_delayed_work_sync(&dev->stat_work);
+
regmap_exit(dev->regmap);
kfree(dev);
return 0;