diff --git a/[refs] b/[refs]
index fc4f4647b718..05a89b41b031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d700d72c9053a1a6816f4237b6d9528f7cf2564
+refs/heads/master: a6de05d87aa8604acf062ce42ace21e08986d2a9
diff --git a/trunk/drivers/staging/csr/sme_blocking.c b/trunk/drivers/staging/csr/sme_blocking.c
index f79811e2d7ed..d88ccd5bd428 100644
--- a/trunk/drivers/staging/csr/sme_blocking.c
+++ b/trunk/drivers/staging/csr/sme_blocking.c
@@ -1455,6 +1455,8 @@ int sme_ap_config(unifi_priv_t *priv,
                                  *ap_mac_config);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
+	if (r)
+		return r;
 
     unifi_trace(priv, UDBG4,
                 "sme_ap_config <-- (r=%d status=%d)\n",