Skip to content

Commit ed8fa04

Browse files
committed
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: Felipe Balbi <[email protected]> * 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
2 parents 603ea28 + cd37c69 commit ed8fa04

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

drivers/usb/dwc3/dwc3-pci.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,10 @@ static void dwc3_pci_resume_work(struct work_struct *work)
206206
int ret;
207207

208208
ret = pm_runtime_get_sync(&dwc3->dev);
209-
if (ret)
209+
if (ret) {
210+
pm_runtime_put_sync_autosuspend(&dwc3->dev);
210211
return;
212+
}
211213

212214
pm_runtime_mark_last_busy(&dwc3->dev);
213215
pm_runtime_put_sync_autosuspend(&dwc3->dev);

drivers/usb/gadget/udc/mv_udc_core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2313,7 +2313,8 @@ static int mv_udc_probe(struct platform_device *pdev)
23132313
return 0;
23142314

23152315
err_create_workqueue:
2316-
destroy_workqueue(udc->qwork);
2316+
if (udc->qwork)
2317+
destroy_workqueue(udc->qwork);
23172318
err_destroy_dma:
23182319
dma_pool_destroy(udc->dtd_pool);
23192320
err_free_dma:

drivers/usb/phy/phy-tegra-usb.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,11 +1199,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
11991199

12001200
platform_set_drvdata(pdev, tegra_phy);
12011201

1202-
err = usb_add_phy_dev(&tegra_phy->u_phy);
1203-
if (err)
1204-
return err;
1205-
1206-
return 0;
1202+
return usb_add_phy_dev(&tegra_phy->u_phy);
12071203
}
12081204

12091205
static int tegra_usb_phy_remove(struct platform_device *pdev)

0 commit comments

Comments
 (0)