qlogic: qed: fix error codes in qed_resc_alloc()
PATCH 1/1 qlogic: qed: fix error codes in qed_resc_alloc()
We accidentally return success instead of -ENOMEM here.
Fixes fe56b9e6a8d9 ('qed: Add module with basic common support')
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/ethernet/qlogic/qed/qed_dev.c +9 -3
@@ -223,6 +223,7 @@ int qed_resc_alloc(struct qed_dev *cdev)if (!p_hwfn->p_tx_cids) {DP_NOTICE (p_hwfn,"Failed to allocate memory for Tx Cids\n" ); + rc = -ENOMEM ; goto alloc_err; }
@@ -230,6 +231,7 @@ int qed_resc_alloc(struct qed_dev *cdev)if (!p_hwfn->p_rx_cids) {DP_NOTICE (p_hwfn,"Failed to allocate memory for Rx Cids\n" ); + rc = -ENOMEM ; goto alloc_err; } }
@@ -281,14 +283,17 @@ int qed_resc_alloc(struct qed_dev *cdev)/* EQ */ p_eq =qed_eq_alloc (p_hwfn,256 ); - -if (!p_eq) +if (!p_eq) { + rc = -ENOMEM ; goto alloc_err; + } p_hwfn->p_eq = p_eq; p_consq =qed_consq_alloc (p_hwfn); -if (!p_consq) +if (!p_consq) { + rc = -ENOMEM ; goto alloc_err; + } p_hwfn->p_consq = p_consq;/* DMA info initialization */
@@ -303,6 +308,7 @@ int qed_resc_alloc(struct qed_dev *cdev) cdev->reset_stats =kzalloc (sizeof (*cdev->reset_stats),GFP_KERNEL );if (!cdev->reset_stats) {DP_NOTICE (cdev,"Failed to allocate reset statistics\n" ); + rc = -ENOMEM ; goto alloc_err; }
Quoted 5 lines
We accidentally return success instead of
-ENOMEMhere.Fixes fe56b9e6a8d9 ('qed: Add module with basic common support')Signed-off-by Dan Carpenter <[email protected]>
Thanks. Although you might also argue that it's good enough for this function to always return -ENOMEM [given it's a resource allocation functions] instead of bothering with setting 'rc' with correct error codes.
Regardless,
Acked-by Yuval Mintz <[email protected]
From: Dan Carpenter <[email protected]>
Date: Thu, 5 Nov 2015 11:41:28 +0300
Quoted 4 lines
We accidentally return success instead of
-ENOMEMhere.Fixes fe56b9e6a8d9 ('qed: Add module with basic common support')Signed-off-by Dan Carpenter <[email protected]>
Applied, thanks Dan.