diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 13:02:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 13:02:47 -0700 |
| commit | dfc568e6bc08916f1035af456e4631c47166b5cf (patch) | |
| tree | 3c96bdc26687e0f6958e790c8c93c0c6efb6b8d6 /drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | |
| parent | fdf91dae6f024c6dfee425fe754df6b1957f6c53 (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| download | blackbird-op-linux-dfc568e6bc08916f1035af456e4631c47166b5cf.tar.gz blackbird-op-linux-dfc568e6bc08916f1035af456e4631c47166b5cf.zip | |
Merge 3.12-rc6 into char-misc-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlge/qlge_dbg.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c index 10093f0c4c0f..6bc5db703920 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c @@ -740,8 +740,8 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump) int i; if (!mpi_coredump) { - netif_err(qdev, drv, qdev->ndev, "No memory available\n"); - return -ENOMEM; + netif_err(qdev, drv, qdev->ndev, "No memory allocated\n"); + return -EINVAL; } /* Try to get the spinlock, but dont worry if |
