1 files changed, 37 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0072-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0072-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch
new file mode 100644
index 00000000..a2fc8cf3
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0072-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch
@@ -0,0 +1,37 @@
+From 7d10af4b409b98292b59a8081e2083e12c23e5c9 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Wed, 16 Nov 2011 01:53:25 -0300
+Subject: [PATCH 72/95] media: staging: lirc_serial: Fix deadlock on resume
+ failure
+
+commit 1ff1d88e862948ae5bfe490248c023ff8ac2855d upstream.
+
+A resume function cannot remove the device it is resuming!
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/media/lirc/lirc_serial.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
+index d833772..befe626 100644
+--- 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 platform_device *dev)
+ {
+        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 */
+-- 
+1.7.9.4
+