diff --git a/[refs] b/[refs]
index 2b07e6181c96..325644c72c83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f58c2e63b4197cba99edd3a4c5c7f4935708fb
+refs/heads/master: 709ac4f43d76135daa9c2e33ab90eadd16bfce15
diff --git a/trunk/drivers/net/qlge/qlge_mpi.c b/trunk/drivers/net/qlge/qlge_mpi.c
index 7cb30fdc9bac..ff8424330a9c 100644
--- a/trunk/drivers/net/qlge/qlge_mpi.c
+++ b/trunk/drivers/net/qlge/qlge_mpi.c
@@ -453,6 +453,13 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)
 	}
 end:
 	ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT);
+	/* Restore the original mailbox count to
+	 * what the caller asked for.  This can get
+	 * changed when a mailbox command is waiting
+	 * for a response and an AEN arrives and
+	 * is handled.
+	 * */
+	mbcp->out_count = orig_count;
 	return status;
 }