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

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

diff --git a/[refs] b/[refs]
index 6cb3a3c64c73..8c4e82841bb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a44dca1717ce2c2381339e21c07d1731a63a7888
+refs/heads/master: afe5624b142279c6072ce1872811e309ad7e94be
diff --git a/trunk/drivers/media/rc/rc-main.c b/trunk/drivers/media/rc/rc-main.c
index d593bc65b4ca..759a40a42eaa 100644
--- a/trunk/drivers/media/rc/rc-main.c
+++ b/trunk/drivers/media/rc/rc-main.c
@@ -892,7 +892,8 @@ static ssize_t store_protocols(struct device *device,
 
 		if (i == ARRAY_SIZE(proto_names)) {
 			IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto out;
 		}
 
 		count++;