[PATCH 10/10] USB: OHCI: Properly handle ohci-spear suspend

Viresh Kumar viresh.kumar at linaro.org
Thu Jun 13 05:19:10 EDT 2013


On 13 June 2013 14:41, Manjunath Goudar <manjunath.goudar at linaro.org> wrote:
> Suspend scenario in case of ohci-spear glue was not
> properly handled as it was not suspending generic part
> of ohci controller.Calling explicitly the ohci_suspend()

Add space after full stop.

> routine in spear_ohci_hcd_drv_suspend() will ensure proper
> handling of suspend scenario.
>
> V2:
>  -Incase ohci_suspend() fails, return right away without
>   executing further.

You added changelog at wrong place. This will get commited once
somebody applies this patch.

> Signed-off-by: Manjunath Goudar <manjunath.goudar at linaro.org>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Alan Stern <stern at rowland.harvard.edu>
> Cc: Greg KH <greg at kroah.com>
> Cc: linux-usb at vger.kernel.org
> ---

Add it here.

>  drivers/usb/host/ohci-spear.c |   16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
> index 31ff3fc..2ff867b 100644
> --- a/drivers/usb/host/ohci-spear.c
> +++ b/drivers/usb/host/ohci-spear.c
> @@ -130,12 +130,22 @@ static int spear_ohci_hcd_drv_remove(struct platform_device *pdev)
>  }
>
>  #if defined(CONFIG_PM)
> -static int spear_ohci_hcd_drv_suspend(struct platform_device *dev,
> +static int spear_ohci_hcd_drv_suspend(struct platform_device *pdev,
>                 pm_message_t message)
>  {
> -       struct usb_hcd *hcd = platform_get_drvdata(dev);
> +       struct usb_hcd *hcd = platform_get_drvdata(pdev);
>         struct ohci_hcd *ohci = hcd_to_ohci(hcd);
>         struct spear_ohci *sohci_p = to_spear_ohci(hcd);
> +       bool do_wakeup = device_may_wakeup(&pdev->dev);
> +       int ret;
> +
> +       ret = ohci_suspend(hcd, do_wakeup);
> +       if (ret == 0 && do_wakeup && HCD_WAKEUP_PENDING(hcd)) {

maybe s/ret == 0/!ret

I thought ret == 0 is the success case and not error case.

> +               ohci_resume(hcd, false);
> +               ret = -EBUSY;
> +       }
> +       if (ret)
> +               return ret;
>
>         if (time_before(jiffies, ohci->next_statechange))
>                 msleep(5);
> @@ -143,7 +153,7 @@ static int spear_ohci_hcd_drv_suspend(struct platform_device *dev,
>
>         clk_disable_unprepare(sohci_p->clk);
>
> -       return 0;
> +       return ret;
>  }
>
>  static int spear_ohci_hcd_drv_resume(struct platform_device *dev)
> --
> 1.7.9.5
>
>
> _______________________________________________
> linaro-dev mailing list
> linaro-dev at lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/linaro-dev



More information about the linux-arm-kernel mailing list