diff --git a/[refs] b/[refs]
index 23f635d03f80..2acd57287506 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf49a6fff1d87510f36afe7e7cec188e452f1db
+refs/heads/master: b4be8959c2cca0a0d3136f9d3bf06a52252911f4
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
index 37a13f099c64..e9d34509a861 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
@@ -621,6 +621,7 @@ int ath6kldev_setup(struct ath6kl_device *dev)
 	/* must be a power of 2 */
 	if ((dev->htc_cnxt->block_sz & (dev->htc_cnxt->block_sz - 1)) != 0) {
 		WARN_ON(1);
+		status = -EINVAL;
 		goto fail_setup;
 	}