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++;