summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorErnst Martin Witte <emw-linux-kernel@nocabal.de>2016-01-09 18:18:47 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-01 09:42:03 -0200
commit4fd57ed61564bd4706e71cfd8c5a259079ddabf3 (patch)
tree4931eac32c89818603f613849f5c55b605a71c3f /drivers/media
parent01d1d714e26624bc50ba95c49cf6e15bb215c150 (diff)
[media] rtl2830: cancel_delayed_work_sync before device removal / kfree
rtl2830_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/rtl2830.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index b792f305cf15..74b771218033 100644
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -900,6 +900,9 @@ static int rtl2830_remove(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
+ /* stop statistics polling */
+ cancel_delayed_work_sync(&dev->stat_work);
+
i2c_del_mux_adapter(dev->adapter);
regmap_exit(dev->regmap);
kfree(dev);