Commit 58e78475 authored Jun 27, 2007 by Jeff Mahoney Committed by Linus Torvalds Jun 28, 2007

saa7134: fix thread shutdown handling



This patch changes the test for the thread pid from >= 0 to > 0.

When the saa8134 driver initialization fails after a certain point, it goes
through the complete shutdown process for the driver.  Part of shutting it
down includes tearing down the thread for tv audio.

The test for tearing down the thread tests for >= 0.  Since the dev
structure is kzalloc'd, the test will always be true if we haven't tried to
start the thread yet.  We end up waiting on pid 0 to complete, which will
never happen, so we lock up.

This bug was observed in Novell Bugzilla 284718, when request_irq() failed.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 53f3bed0

drivers/media/video/saa7134/saa7134-tvaudio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1005,7 +1005,7 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
		int saa7134_tvaudio_fini(struct saa7134_dev *dev)
		{
		/* shutdown tvaudio thread */
		if (dev->thread.pid >= 0) {
		if (dev->thread.pid > 0) {
		dev->thread.shutdown = 1;
		wake_up_interruptible(&dev->thread.wq);
		wait_for_completion(&dev->thread.exit);