Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4129a9c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 411674fd

drivers/media/video/tvaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -2050,6 +2050,7 @@ static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id * 
	}



	chip->thread = NULL;

	init_timer(&chip->wt);

	if (desc->flags & CHIP_NEED_CHECKMODE) {

		if (!desc->getmode || !desc->setmode) {

			/* 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;

		}

		/* start async thread */

		init_timer(&chip->wt);

		chip->wt.function = chip_thread_wake;

		chip->wt.data     = (unsigned long)chip;

		chip->thread = kthread_run(chip_thread, chip, client->name);