This is a note to let you know that I've just added the patch titled
media: staging: lirc_serial: Fix deadlock on resume failure
to the 3.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-staging-lirc_serial-fix-deadlock-on-resume-failure.patch
and it can be found in the queue-3.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 1ff1d88e862948ae5bfe490248c023ff8ac2855d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <[email protected]>
Date: Wed, 16 Nov 2011 01:53:25 -0300
Subject: media: staging: lirc_serial: Fix deadlock on resume failure
From: Ben Hutchings <[email protected]>
commit 1ff1d88e862948ae5bfe490248c023ff8ac2855d upstream.
A resume function cannot remove the device it is resuming!
Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Jonathan Nieder <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/media/lirc/lirc_serial.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -1127,10 +1127,8 @@ static int lirc_serial_resume(struct pla
{
unsigned long flags;
- if (hardware_init_port() < 0) {
- lirc_serial_exit();
+ if (hardware_init_port() < 0)
return -EINVAL;
- }
spin_lock_irqsave(&hardware[type].lock, flags);
/* Enable Interrupt */
Patches currently in stable-queue which might be from [email protected] are
queue-3.2/media-staging-lirc_serial-do-not-assume-error-codes-returned-by-request_irq.patch
queue-3.2/media-staging-lirc_serial-fix-deadlock-on-resume-failure.patch
queue-3.2/media-staging-lirc_serial-free-resources-on-failure-paths-of-lirc_serial_probe.patch
queue-3.2/media-staging-lirc_serial-fix-init-exit-order.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
