| From 4f257c3938f60b154dfa66a2e9163f8f93adbc69 Mon Sep 17 00:00:00 2001 |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Date: Tue, 10 Apr 2018 14:38:51 +0900 |
| Subject: [PATCH 1265/1795] usb: gadget: udc: renesas_usb3: should call |
| pm_runtime_enable() before add udc |
| |
| This patch fixes an issue that this driver causes panic if a gadget |
| driver is already loaded because usb_add_gadget_udc() might call |
| renesas_usb3_start() via .udc_start, and then pm_runtime_get_sync() |
| in renesas_usb3_start() doesn't work correctly. |
| Note that the usb3_to_dev() macro should not be called at this timing |
| because the macro uses the gadget structure. |
| |
| Fixes: cf06df3fae28 ("usb: gadget: udc: renesas_usb3: move pm_runtime_{en,dis}able()") |
| Cc: <stable@vger.kernel.org> # v4.15+ |
| Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Reviewed-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| (cherry picked from commit d998844016b24a8d71b9aa5eae7e51d70f2de438) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/usb/gadget/udc/renesas_usb3.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c |
| index 94224101033e..2afb235006dc 100644 |
| --- a/drivers/usb/gadget/udc/renesas_usb3.c |
| +++ b/drivers/usb/gadget/udc/renesas_usb3.c |
| @@ -2641,6 +2641,7 @@ static int renesas_usb3_probe(struct platform_device *pdev) |
| if (ret < 0) |
| goto err_alloc_prd; |
| |
| + pm_runtime_enable(&pdev->dev); |
| ret = usb_add_gadget_udc(&pdev->dev, &usb3->gadget); |
| if (ret < 0) |
| goto err_add_udc; |
| @@ -2662,7 +2663,6 @@ static int renesas_usb3_probe(struct platform_device *pdev) |
| renesas_usb3_debugfs_init(usb3, &pdev->dev); |
| |
| dev_info(&pdev->dev, "probed%s\n", usb3->phy ? " with phy" : ""); |
| - pm_runtime_enable(usb3_to_dev(usb3)); |
| |
| return 0; |
| |
| -- |
| 2.19.0 |
| |
