3.0-stable patches

added patches:
	media-rc-unlock-on-error-in-show_protocols.patch

diff --git a/queue-3.0/media-rc-unlock-on-error-in-show_protocols.patch b/queue-3.0/media-rc-unlock-on-error-in-show_protocols.patch
new file mode 100644 (file)
index 0000000..66cc941
--- /dev/null
+++ b/queue-3.0/media-rc-unlock-on-error-in-show_protocols.patch
@@ -0,0 +1,37 @@
+From 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Tue, 27 Nov 2012 13:35:09 -0300
+Subject: media: rc: unlock on error in show_protocols()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 upstream.
+
+We recently introduced a new return -ENODEV in this function but we need
+to unlock before returning.
+
+[mchehab@redhat.com: found two patches with the same fix. Merged SOB's/acks into one patch]
+Acked-by: Herton R. Krzesinski <herton.krzesinski@canonical.com>
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Douglas Bagnall <douglas@paradise.net.nz>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/rc/rc-main.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/media/rc/rc-main.c
++++ b/drivers/media/rc/rc-main.c
+@@ -775,8 +775,10 @@ static ssize_t show_protocols(struct dev
+       } else if (dev->raw) {
+               enabled = dev->raw->enabled_protocols;
+               allowed = ir_raw_get_allowed_protocols();
+-      } else
++      } else {
++              mutex_unlock(&dev->lock);
+               return -ENODEV;
++      }
+ 
+       IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
+                  (long long)allowed,

diff --git a/queue-3.0/series b/queue-3.0/series
index b1adf0ec8e5b8fd2aa46cb85ab8a593646fe71cb..8a28cdf040438b55c08c3f8caf0b80ce76cd0568 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -11,3 +11,4 @@ xen-blkback-do-not-leak-mode-property.patch
 idr-fix-a-subtle-bug-in-idr_get_next.patch
 firewire-add-minor-number-range-check-to-fw_device_init.patch
 sysctl-fix-null-checking-in-bin_dn_node_address.patch
+media-rc-unlock-on-error-in-show_protocols.patch