Messages in this thread | | | Date | Tue, 18 Nov 2008 14:30:45 +0000 | From | Alan Jenkins <> | Subject | Re: [atl1-devel] atl2: don't mess up irq on suspend/resume (probably msi only) |
| |
Jay Cliburn wrote: > [adding netdev to cc list] > > On Mon, 17 Nov 2008 21:43:16 +0000 > Alan Jenkins <alan-jenkins@tuffmail.co.uk> wrote: > > > >> Don't listen to me. The problem went away because when I was testing >> my patch, I plugged the ethernet in and actually used it. My patch >> doesn't seem to fix anything. >> >> So I now have the steps to reproduce this warning: remove the ethernet >> cable and suspend. >> >> Also, I was speaking rubbish because the warning isn't on the resume >> path. It seems to be when network-manager re-opens the device on >> resume. >> >> I'll have another look for possible culprits. Hints appreciated :). >> > > Does this help? >
Ah! Yes, that fixes it, thanks.
> diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c > index f5bdc92..5b292f0 100644 > --- a/drivers/net/atlx/atl2.c > +++ b/drivers/net/atlx/atl2.c > @@ -1690,10 +1690,6 @@ 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; > - > atl2_reset_hw(&adapter->hw); > > if (netif_running(netdev)) >
| |