diff options
| author | Tony Lindgren <[email protected]> | 2020-06-16 16:25:03 +0000 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2020-06-16 16:25:03 +0000 |
| commit | 07c7b547a79605f1041d55b84d91a4a4d9c5b363 (patch) | |
| tree | d98c1adacc8c65b475c325b427e54b8205b0013d /drivers/usb/cdns3/cdns3-ti.c | |
| parent | Revert "bus: ti-sysc: Increase max softreset wait" (diff) | |
| parent | Linux 5.8-rc1 (diff) | |
| download | kernel-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.gz kernel-07c7b547a79605f1041d55b84d91a4a4d9c5b363.zip | |
Merge tag 'v5.8-rc1' into fixes
Linux 5.8-rc1
Diffstat (limited to 'drivers/usb/cdns3/cdns3-ti.c')
| -rw-r--r-- | drivers/usb/cdns3/cdns3-ti.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index 5685ba11480b..e701ab56b0a7 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -138,7 +138,7 @@ static int cdns_ti_probe(struct platform_device *pdev) error = pm_runtime_get_sync(dev); if (error < 0) { dev_err(dev, "pm_runtime_get_sync failed: %d\n", error); - goto err_get; + goto err; } /* assert RESET */ @@ -185,7 +185,6 @@ static int cdns_ti_probe(struct platform_device *pdev) err: pm_runtime_put_sync(data->dev); -err_get: pm_runtime_disable(data->dev); return error; |