diff --git a/[refs] b/[refs]
index 0dfe98ca63dd..de51729fe7de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 742e519b0db4a470008118b48f0baea6126e2122
+refs/heads/master: ae12d52efd492ee6634c34322302ac754ff8cde8
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 03e9125dd74f..ceed5df43fee 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -2621,9 +2621,6 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
 			return -ECONNREFUSED;
 
 		break;
-	default:
-		pi->mode = l2cap_select_mode(rfc.mode, pi->conn->feat_mask);
-		break;
 	}
 
 done: