From fde5da227bbc87186c27a0ab453fb4bb66a39aba Mon Sep 17 00:00:00 2001 From: Marc Pignat Date: Tue, 9 Jan 2007 14:00:11 -0800 Subject: [PATCH] --- yaml --- r: 46661 b: refs/heads/master c: 6dde896e4eac122f388263f0097b691acdc0396f h: refs/heads/master i: 46659: a91b29c13d0d8f9bf4ba3b885bd4507410c1f5db v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-at91.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 120b4103e779..2ac3013739ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3f4906516a084bbd9aa3da7592e6b029fe78f5b +refs/heads/master: 6dde896e4eac122f388263f0097b691acdc0396f diff --git a/trunk/drivers/usb/host/ohci-at91.c b/trunk/drivers/usb/host/ohci-at91.c index 53f62cf7698b..930346487278 100644 --- a/trunk/drivers/usb/host/ohci-at91.c +++ b/trunk/drivers/usb/host/ohci-at91.c @@ -170,7 +170,6 @@ static int usb_hcd_at91_remove(struct usb_hcd *hcd, at91_stop_hc(pdev); iounmap(hcd->regs); release_mem_region(hcd->rsrc_start, hcd->rsrc_len); - disable_irq_wake(hcd->irq); clk_put(fclk); clk_put(iclk); @@ -271,8 +270,6 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg) if (device_may_wakeup(&pdev->dev)) enable_irq_wake(hcd->irq); - else - disable_irq_wake(hcd->irq); /* * The integrated transceivers seem unable to notice disconnect, @@ -293,6 +290,11 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg) static int ohci_hcd_at91_drv_resume(struct platform_device *pdev) { + struct usb_hcd *hcd = platform_get_drvdata(pdev); + + if (device_may_wakeup(&pdev->dev)) + disable_irq_wake(hcd->irq); + if (!clocked) { clk_enable(iclk); clk_enable(fclk);