From e0ca816dd9628bc20256bf45686582df6e4896b2 Mon Sep 17 00:00:00 2001 From: Jitendra Kalsaria Date: Tue, 10 Jul 2012 14:57:36 +0000 Subject: [PATCH] --- yaml --- r: 315109 b: refs/heads/master c: f5c4441cd80123c0f13fca75afc811c9c2b64add h: refs/heads/master i: 315107: d835d6021650b4c9dc4b6eebac47cd7da9f9f7a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4b339acade25..edc541daa1dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7db9ad1d48b502613f96054f21b107a8403237a +refs/heads/master: f5c4441cd80123c0f13fca75afc811c9c2b64add diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 5cfba6aa1b92..bccbc4e2b31a 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -2708,10 +2708,9 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev, &tx_ring->wq_base_dma); if ((tx_ring->wq_base == NULL) || - tx_ring->wq_base_dma & WQ_ADDR_ALIGN) { - netif_err(qdev, ifup, qdev->ndev, "tx_ring alloc failed.\n"); - return -ENOMEM; - } + tx_ring->wq_base_dma & WQ_ADDR_ALIGN) + goto pci_alloc_err; + tx_ring->q = kmalloc(tx_ring->wq_len * sizeof(struct tx_ring_desc), GFP_KERNEL); if (tx_ring->q == NULL) @@ -2721,6 +2720,9 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev, err: pci_free_consistent(qdev->pdev, tx_ring->wq_size, tx_ring->wq_base, tx_ring->wq_base_dma); + tx_ring->wq_base = NULL; +pci_alloc_err: + netif_err(qdev, ifup, qdev->ndev, "tx_ring alloc failed.\n"); return -ENOMEM; }