evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V4L/DVB (11277): tvaudio: always call init_timer to prevent rmmod crash.

Browse source 
In the tvaudio_remove function del_timer_sync(&chip->wt) is called.
However, chip->wt isn't always initialized depending on the type of
audio chip. Since del_timer_sync hangs when given an uninitialized timer
we should always initialize it.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2009-03-19 16:53:32 -03:00 • committed by Mauro Carvalho Chehab
parent 411674fd18
commit e4129a9cce
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/video/tvaudio.c
View file

@ -2050,6 +2050,7 @@ static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *
} }
chip->thread = NULL; chip->thread = NULL;
init_timer(&chip->wt);
if (desc->flags & CHIP_NEED_CHECKMODE) { if (desc->flags & CHIP_NEED_CHECKMODE) {
if (!desc->getmode || !desc->setmode) { if (!desc->getmode || !desc->setmode) {
/* This shouldn't be happen. Warn user, but keep working /* This shouldn't be happen. Warn user, but keep working
@ -2059,7 +2060,6 @@ static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *
return 0; return 0;
} }
/* start async thread */ /* start async thread */
init_timer(&chip->wt);
chip->wt.function = chip_thread_wake; chip->wt.function = chip_thread_wake;
chip->wt.data = (unsigned long)chip; chip->wt.data = (unsigned long)chip;
chip->thread = kthread_run(chip_thread, chip, client->name); chip->thread = kthread_run(chip_thread, chip, client->name);