Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / sfc / mcdi.c

diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index 12cf910c2ce712f72dc5b960695700395b516d59..b716e827b291bca53dab4464543553c1cdaa9673 100644 (file)
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -381,7 +381,7 @@ int efx_mcdi_rpc(struct efx_nic *efx, unsigned cmd,
                                  -rc);
                        efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE);
                } else
-                       netif_err(efx, hw, efx->net_dev,
+                       netif_dbg(efx, hw, efx->net_dev,
                                  "MC command 0x%x inlen %d failed rc=%d\n",
                                  cmd, (int)inlen, -rc);
        }
@@ -463,6 +463,7 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc)
                if (mcdi->mode == MCDI_MODE_EVENTS) {
                        mcdi->resprc = rc;
                        mcdi->resplen = 0;
+                       ++mcdi->credits;
                }
        } else
                /* Nobody was waiting for an MCDI request, so trigger a reset */