diff mbox

qlge: call ql_core_dump() only if dump memory was allocated.

Message ID 1379691031-28666-1-git-send-email-malahal@us.ibm.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

malahal@us.ibm.com Sept. 20, 2013, 3:30 p.m. UTC 
Also changed a log message to indicate that memory was not allocated
instead of memory not available!
---
 drivers/net/ethernet/qlogic/qlge/qlge_dbg.c |  4 ++--
 drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

Comments

David Miller Sept. 20, 2013, 4:02 p.m. UTC | #1 
From: Malahal Naineni <malahal@us.ibm.com>
Date: Fri, 20 Sep 2013 10:30:31 -0500

> Also changed a log message to indicate that memory was not allocated
> instead of memory not available!

This change is not submitted properly, in particular it is missing
a signoff.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index 10093f0..6bc5db7 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
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
index ff2bf8a..99a3e07 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
@@ -1274,11 +1274,13 @@  void ql_mpi_reset_work(struct work_struct *work)
 		return;
 	}
 
-	if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
-		netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
-		qdev->core_is_dumped = 1;
-		queue_delayed_work(qdev->workqueue,
-			&qdev->mpi_core_to_log, 5 * HZ);
+	if (qdev->mpi_coredump) {
+		if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
+			netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
+			qdev->core_is_dumped = 1;
+			queue_delayed_work(qdev->workqueue,
+				&qdev->mpi_core_to_log, 5 * HZ);
+		}
 	}
 	ql_soft_reset_mpi_risc(qdev);
 }