Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7adda30c82f403c948b016a40fc68a1ef427dbca
Commit:     7adda30c82f403c948b016a40fc68a1ef427dbca
Parent:     a27993f3d9daca0dffa26577a83822db99c952e2
Author:     Brice Goglin <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 11:50:00 2006 +0100
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue Dec 26 16:28:20 2006 -0500

    myri10ge: match number of save_state and restore
    
    Since pci_save_state() pushes MSI and PCIe states on a kind of stack,
    myri10ge saving the state in advance for parity recovery will push the
    state again on the stack on suspend. This leads to some memory leak.
    We add a couple additional calls to save_state and restore_state so
    that we don't leak anymore.
    
    For the future, we are thinking of a better way to recover from parity
    error without using pci_save_state().
    
    Signed-off-by: Brice Goglin <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/myri10ge/myri10ge.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 94ac168..2854026 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2641,6 +2641,10 @@ static void myri10ge_watchdog(struct work_struct *work)
                 * nic was resumed from power saving mode.
                 */
                myri10ge_restore_state(mgp);
+
+               /* save state again for accounting reasons */
+               myri10ge_save_state(mgp);
+
        } else {
                /* if we get back -1's from our slot, perhaps somebody
                 * powered off our card.  Don't try to reset it in
@@ -2907,7 +2911,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
        status = register_netdev(netdev);
        if (status != 0) {
                dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
-               goto abort_with_irq;
+               goto abort_with_state;
        }
        dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
                 (mgp->msi_enabled ? "MSI" : "xPIC"),
@@ -2916,7 +2920,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
 
        return 0;
 
-abort_with_irq:
+abort_with_state:
+       myri10ge_restore_state(mgp);
        free_irq(pdev->irq, mgp);
        if (mgp->msi_enabled)
                pci_disable_msi(pdev);
@@ -2976,6 +2981,9 @@ static void myri10ge_remove(struct pci_dev *pdev)
 
        myri10ge_dummy_rdma(mgp, 0);
 
+       /* avoid a memory leak */
+       myri10ge_restore_state(mgp);
+
        bytes = myri10ge_max_intr_slots * sizeof(*mgp->rx_done.entry);
        dma_free_coherent(&pdev->dev, bytes,
                          mgp->rx_done.entry, mgp->rx_done.bus);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to