Commit ed8fa042 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'fixes-for-v5.8-rc2' of...

Merge tag 'fixes-for-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v5.8-rc2

A revert of Exynos5422 suspend clock support, it turns out it wasn't
ready to be merged. CDNS3 got a fix for test mode initialization.
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>

* tag 'fixes-for-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  Revert "usb: dwc3: exynos: Add support for Exynos5422 suspend clk"
  usb: gadget: udc: Potential Oops in error handling code
  usb: phy: tegra: Fix unnecessary check in tegra_usb_phy_probe()
  usb: dwc3: pci: Fix reference count leak in dwc3_pci_resume_work
  usb: cdns3: ep0: add spinlock for cdns3_check_new_setup
  usb: cdns3: trace: using correct dir value
  usb: cdns3: ep0: fix the test mode set incorrectly
parents 603ea288 cd37c697
...@@ -206,8 +206,10 @@ static void dwc3_pci_resume_work(struct work_struct *work) ...@@ -206,8 +206,10 @@ static void dwc3_pci_resume_work(struct work_struct *work)
int ret; int ret;
ret = pm_runtime_get_sync(&dwc3->dev); ret = pm_runtime_get_sync(&dwc3->dev);
if (ret) if (ret) {
pm_runtime_put_sync_autosuspend(&dwc3->dev);
return; return;
}
pm_runtime_mark_last_busy(&dwc3->dev); pm_runtime_mark_last_busy(&dwc3->dev);
pm_runtime_put_sync_autosuspend(&dwc3->dev); pm_runtime_put_sync_autosuspend(&dwc3->dev);
......
...@@ -2313,6 +2313,7 @@ static int mv_udc_probe(struct platform_device *pdev) ...@@ -2313,6 +2313,7 @@ static int mv_udc_probe(struct platform_device *pdev)
return 0; return 0;
err_create_workqueue: err_create_workqueue:
if (udc->qwork)
destroy_workqueue(udc->qwork); destroy_workqueue(udc->qwork);
err_destroy_dma: err_destroy_dma:
dma_pool_destroy(udc->dtd_pool); dma_pool_destroy(udc->dtd_pool);
......
...@@ -1199,11 +1199,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev) ...@@ -1199,11 +1199,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, tegra_phy); platform_set_drvdata(pdev, tegra_phy);
err = usb_add_phy_dev(&tegra_phy->u_phy); return usb_add_phy_dev(&tegra_phy->u_phy);
if (err)
return err;
return 0;
} }
static int tegra_usb_phy_remove(struct platform_device *pdev) static int tegra_usb_phy_remove(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment