[atl1-devel] atl2: don't mess up irq on suspend/resume (probably msi only)

Message ID 49231CCB.8010900@tuffmail.co.uk
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Alan Jenkins Nov. 18, 2008, 7:51 p.m.
Alan Jenkins wrote:
> Alan Jenkins wrote:
>> 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.
> Just noticed another problem. If I suspend with the cable plugged in,
> I get a warning message about freeing the IRQ
which was caused by your patch.  It works better (for both cable plugged and unplugged cases) if I do this instead:

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;
+	}