Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9d3840e authored by Majunath Goudar's avatar Majunath Goudar Committed by Greg Kroah-Hartman
Browse files

USB: OHCI: Properly handle ohci-at91 suspend



Suspend scenario in case of ohci-at91 glue was not properly handled
as it was not suspending generic part of ohci controller. Alan Stern
suggested, properly handle ohci-at91 suspend scenario.

Calling explicitly the ohci_suspend() routine in ohci_hcd_at91_drv_suspend()
will ensure proper handling of suspend scenario. This task is sugested
by Alan Stern.

Signed-off-by: default avatarManjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1bffbf6
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -635,10 +635,17 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg)
{
	struct usb_hcd	*hcd = platform_get_drvdata(pdev);
	struct ohci_hcd	*ohci = hcd_to_ohci(hcd);
	bool		do_wakeup = device_may_wakeup(&pdev->dev);
	int		ret;

	if (device_may_wakeup(&pdev->dev))
	if (do_wakeup)
		enable_irq_wake(hcd->irq);

	ret = ohci_suspend(hcd, do_wakeup);
	if (ret) {
		disable_irq_wake(hcd->irq);
		return ret;
	}
	/*
	 * The integrated transceivers seem unable to notice disconnect,
	 * reconnect, or wakeup without the 48 MHz clock active.  so for
@@ -657,7 +664,7 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg)
		at91_stop_clock();
	}

	return 0;
	return ret;
}

static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)