diff --git a/[refs] b/[refs]
index 7abd61d82cae..7997462acfb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f84ac08db25f60a6973cac1a90f392b286054e2f
+refs/heads/master: 936e8a734fea8f18d0d90846bb726fd5bd7e128b
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index d03b5e57759f..400eb312b555 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -96,14 +96,14 @@ int iwl_send_calib_results(struct iwl_priv *priv)
 			hcmd.len = priv->calib_results[i].buf_len;
 			hcmd.data = priv->calib_results[i].buf;
 			ret = iwl_send_cmd_sync(priv, &hcmd);
-			if (ret)
-				goto err;
+			if (ret) {
+				IWL_ERR(priv, "Error %d iteration %d\n",
+					ret, i);
+				break;
+			}
 		}
 	}
 
-	return 0;
-err:
-	IWL_ERR(priv, "Error %d iteration %d\n", ret, i);
 	return ret;
 }