saa6588: Prevent general protection fault on rmmod
PATCH 1/1 saa6588: Prevent general protection fault on rmmod
The removal of the timer which polls the infrared input is racy. Replacing the timer with a delayed work solves the problem.
Signed-off-by Jean Delvare <[email protected]>
--- linux/drivers/media/video/saa6588.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
linux/drivers/media/video/saa6588.c +7 -19
@@ -77,8 +77,7 @@ MODULE_LICENSE("GPL");struct saa6588 {struct v4l2_subdev sd; -struct work_struct work; -struct timer_list timer; +struct delayed_work work;spinlock_t lock;unsigned char *buffer;unsigned int buf_size;
@@ -323,13 +322,6 @@ static void saa6588_i2c_poll(struct saa6wake_up_interruptible (&s->read_queue); } -static void saa6588_timer (unsigned long data) -{ -struct saa6588 *s = (struct saa6588 *)data; - -schedule_work (&s->work); -} -#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,20 )static void saa6588_work (void *data) #else
@@ -339,11 +331,11 @@ static void saa6588_work(struct work_str#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,20 )struct saa6588 *s = (struct saa6588 *)data;#else - struct saa6588 *s = container_of(work, struct saa6588, work); + struct saa6588 *s = container_of(work, struct saa6588, work.work);#endif saa6588_i2c_poll (s); -mod_timer (&s->timer, jiffies +msecs_to_jiffies (20 )); +schedule_delayed_work (&s->work,msecs_to_jiffies (20 )); }static int saa6588_configure (struct saa6588 *s)
@@ -500,14 +492,11 @@ static int saa6588_probe(struct i2c_clie/* start polling via eventd */ #if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,20 ) -INIT_WORK (&s->work, saa6588_work, s); +INIT_DELAYED_WORK (&s->work, saa6588_work, s);#else -INIT_WORK (&s->work, saa6588_work); +INIT_DELAYED_WORK (&s->work, saa6588_work);#endif -init_timer (&s->timer); - s->timer.function = saa6588_timer; - s->timer.data = (unsigned long )s; -schedule_work (&s->work); +schedule_delayed_work (&s->work,0 );return 0 ; }
@@ -518,8 +507,7 @@ static int saa6588_remove(struct i2c_cliv4l2_device_unregister_subdev (sd); -del_timer_sync (&s->timer); -flush_scheduled_work (); +cancel_delayed_work_sync (&s->work);kfree (s->buffer);kfree (s);
Signature · 1 line
Jean Delvare