From 98a1931fe7770c1cde91687393902bc7b2f2ee35 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 10 Aug 2010 07:36:24 +0200
Subject: [PATCH] --- yaml --- r: 219679 b: refs/heads/master c:
 0b6e7220ed2be6e40bbda4eeb2b9c397008f2cef h: refs/heads/master i:   219677:
 178776c78b621e9be5ad4f4bab9e6dfb445d1cb2   219675:
 2cfcf98ac225a7dac6c6e6428dd140683fc993d0   219671:
 ec85eacf72dd41fc5a1169d6ac490810c735d1f0   219663:
 3b531263c923b4a508bfb46d8b8050b3b5d4e770   219647:
 991ee1ab4022a70f518c9ca9c41fc031babe3019 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/ti-st/st_core.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b609e85feeff..fa3f5ec55f31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a8a4b75307c2ce9f893183b895b0b279621b67e
+refs/heads/master: 0b6e7220ed2be6e40bbda4eeb2b9c397008f2cef
diff --git a/trunk/drivers/staging/ti-st/st_core.c b/trunk/drivers/staging/ti-st/st_core.c
index 063c9b1db1ab..0dfed21721e5 100644
--- a/trunk/drivers/staging/ti-st/st_core.c
+++ b/trunk/drivers/staging/ti-st/st_core.c
@@ -686,9 +686,8 @@ long st_register(struct st_proto_s *new_proto)
 		default:
 			pr_err("%d protocol not supported",
 				   new_proto->type);
-			err = -EPROTONOSUPPORT;
-			/* something wrong */
-			break;
+			spin_unlock_irqrestore(&st_gdata->lock, flags);
+			return -EPROTONOSUPPORT;
 		}
 		st_gdata->list[new_proto->type] = new_proto;
 		st_gdata->protos_registered++;