Message ID | 20081119183443.7ca1cf23@osprey.hogchain.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Jay Cliburn <jcliburn@gmail.com> Date: Wed, 19 Nov 2008 18:34:43 -0600 > Can someone tell before I submit this patch if the description is sane? > > atl2: don't request irq on resume if netif running It looks good, mind if I just apply this as-is? Thanks. -- 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
On Thu, 20 Nov 2008 01:44:20 -0800 (PST) David Miller <davem@davemloft.net> wrote: > From: Jay Cliburn <jcliburn@gmail.com> > Date: Wed, 19 Nov 2008 18:34:43 -0600 > > > Can someone tell before I submit this patch if the description is > > sane? > > > > atl2: don't request irq on resume if netif running > > It looks good, mind if I just apply this as-is? Yes please. Go right ahead. Thanks. -- 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
From: Jay Cliburn <jcliburn@gmail.com> Date: Thu, 20 Nov 2008 05:33:29 -0600 > On Thu, 20 Nov 2008 01:44:20 -0800 (PST) > David Miller <davem@davemloft.net> wrote: > > > From: Jay Cliburn <jcliburn@gmail.com> > > Date: Wed, 19 Nov 2008 18:34:43 -0600 > > > > > Can someone tell before I submit this patch if the description is > > > sane? > > > > > > atl2: don't request irq on resume if netif running > > > > It looks good, mind if I just apply this as-is? > > Yes please. Go right ahead. Thanks. Done. -- 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 --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index f5bdc92..8571e8c 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c @@ -1690,9 +1690,11 @@ static int atl2_resume(struct pci_dev *pdev) ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); - err = atl2_request_irq(adapter); - if (netif_running(netdev) && err) - return err; + if (netif_running(netdev)) { + err = atl2_request_irq(adapter); + if (err) + return err; + } atl2_reset_hw(&adapter->hw);