diff --git a/[refs] b/[refs]
index 7cd38a7017c7..5db781bf0dde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51fd7b754ae40221e5c66e7116f9d7cf03b757cd
+refs/heads/master: 97a18a6b7db2843a40a37ab1f6d76c6ea9617ee6
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
index 549a61278934..2ee423681357 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
@@ -1068,12 +1068,7 @@ void *ai_setcore(si_t *sih, uint coreid, uint coreunit)
 	if (!GOODIDX(idx))
 		return NULL;
 
-	if (sih->socitype == SOCI_AI)
-		return ai_setcoreidx(sih, idx);
-	else {
-		ASSERT(0);
-		return NULL;
-	}
+	return ai_setcoreidx(sih, idx);
 }
 
 /* Turn off interrupt as required by ai_setcore, before switch core */