On Thu, Nov 21, 2013 at 05:49:32PM +0100, Marc Kleine-Budde wrote:
> From: Peter Chen <Peter.Chen@xxxxxxxxxxxxx>
>
> Not-Signed-off-by: Peter Chen <Peter.Chen@xxxxxxxxxxxxx>
> Reported-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> Tested-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> ---
> Hello,
>
> I've moved the comment in ci_hdrc_probe() in front of the if. Peter can you
> please add a meaningfull description to the patch, as I don't fully understand
> how it really fixes the problem. Can you add stable on Cc for the final patch?
>
> Tested on imx28-evk and custom board.
>
> Marc
>
> drivers/usb/chipidea/core.c | 4 ++++
> drivers/usb/chipidea/udc.c | 3 ---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index 40e1ed1..1aae446 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -621,6 +621,10 @@ static int ci_hdrc_probe(struct platform_device *pdev)
> : CI_ROLE_GADGET;
> }
>
> + /* only update vbus status for peripheral */
> + if (ci->role == CI_ROLE_GADGET)
> + ci_handle_vbus_change(ci);
> +
> ret = ci_role_start(ci, ci->role);
> if (ret) {
> dev_err(dev, "can't start %s role\n", ci_role(ci)->name);
> diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> index b34c819..69d20fb 100644
> --- a/drivers/usb/chipidea/udc.c
> +++ b/drivers/usb/chipidea/udc.c
> @@ -1795,9 +1795,6 @@ static int udc_start(struct ci_hdrc *ci)
> pm_runtime_no_callbacks(&ci->gadget.dev);
> pm_runtime_enable(&ci->gadget.dev);
>
> - /* Update ci->vbus_active */
> - ci_handle_vbus_change(ci);
> -
> return retval;
>
> destroy_eps:
> --
> 1.8.4.2
Acked-by: Michael Grzeschik <mgr@xxxxxxxxxxxxxx>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
