From 4685385d943cb5c25be1b77ae156458aef7b3819 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 27 Nov 2012 13:35:09 -0300
Subject: [PATCH] --- yaml --- r: 357169 b: refs/heads/master c:
 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 h: refs/heads/master i:   357167:
 fe6e7a562ce6d192cab473186f162ef972c195d5 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/media/rc/rc-main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9692fd72b0d9..faa7e82a9600 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45b82596be0214f161c8176bd3e18f779e36eccd
+refs/heads/master: 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8
diff --git a/trunk/drivers/media/rc/rc-main.c b/trunk/drivers/media/rc/rc-main.c
index 601d1ac1c688..d593bc65b4ca 100644
--- a/trunk/drivers/media/rc/rc-main.c
+++ b/trunk/drivers/media/rc/rc-main.c
@@ -789,8 +789,10 @@ static ssize_t show_protocols(struct device *device,
 	} 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,