---

yaml --- r: 219679 b: refs/heads/master c: 0b6e722 h: refs/heads/master i: 219677: 178776c 219675: 2cfcf98 219671: ec85eac 219663: 3b53126 219647: 991ee1a v: v3
git-mirror · Aug 31, 2010 · 98a1931 · 98a1931
1 parent 3f70eec
commit 98a1931
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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++;