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

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

USB: OHCI: Properly handle ohci-s3c2410 suspend 



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

Calling explicitly the ohci_suspend()
routine in ohci_hcd_s3c2410_drv_suspend() will ensure
proper handling of suspend scenario.

Signed-off-by: default avatarManjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9d3840e

drivers/usb/host/ohci-s3c2410.c

+4 −17
Original line number Diff line number Diff line
@@ -426,28 +426,15 @@ static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev) 
static int ohci_hcd_s3c2410_drv_suspend(struct device *dev)

{

	struct usb_hcd *hcd = dev_get_drvdata(dev);

	struct ohci_hcd *ohci = hcd_to_ohci(hcd);

	struct platform_device *pdev = to_platform_device(dev);

	unsigned long flags;

	bool do_wakeup = device_may_wakeup(dev);

	int rc = 0;



	/*

	 * Root hub was already suspended. Disable irq emission and

	 * mark HW unaccessible, bail out if RH has been resumed. Use

	 * the spinlock to properly synchronize with possible pending

	 * RH suspend or resume activity.

	 */

	spin_lock_irqsave(&ohci->lock, flags);

	if (ohci->rh_state != OHCI_RH_SUSPENDED) {

		rc = -EINVAL;

		goto bail;

	}



	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

	rc = ohci_suspend(hcd, do_wakeup);

	if (rc)

		return rc;



	s3c2410_stop_hc(pdev);

bail:

	spin_unlock_irqrestore(&ohci->lock, flags);



	return rc;

}