Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
dwc3
/
dwc3-exynos.c
diff --git
a/kernel/drivers/usb/dwc3/dwc3-exynos.c
b/kernel/drivers/usb/dwc3/dwc3-exynos.c
index
dd5cb55
..
2f1fb7e
100644
(file)
--- a/
kernel/drivers/usb/dwc3/dwc3-exynos.c
+++ b/
kernel/drivers/usb/dwc3/dwc3-exynos.c
@@
-128,12
+128,6
@@
static int dwc3_exynos_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, exynos);
platform_set_drvdata(pdev, exynos);
- ret = dwc3_exynos_register_phys(exynos);
- if (ret) {
- dev_err(dev, "couldn't register PHYs\n");
- return ret;
- }
-
exynos->dev = dev;
exynos->clk = devm_clk_get(dev, "usbdrd30");
exynos->dev = dev;
exynos->clk = devm_clk_get(dev, "usbdrd30");
@@
-183,20
+177,29
@@
static int dwc3_exynos_probe(struct platform_device *pdev)
goto err3;
}
goto err3;
}
+ ret = dwc3_exynos_register_phys(exynos);
+ if (ret) {
+ dev_err(dev, "couldn't register PHYs\n");
+ goto err4;
+ }
+
if (node) {
ret = of_platform_populate(node, NULL, NULL, dev);
if (ret) {
dev_err(dev, "failed to add dwc3 core\n");
if (node) {
ret = of_platform_populate(node, NULL, NULL, dev);
if (ret) {
dev_err(dev, "failed to add dwc3 core\n");
- goto err
4
;
+ goto err
5
;
}
} else {
dev_err(dev, "no device node, failed to add dwc3 core\n");
ret = -ENODEV;
}
} else {
dev_err(dev, "no device node, failed to add dwc3 core\n");
ret = -ENODEV;
- goto err
4
;
+ goto err
5
;
}
return 0;
}
return 0;
+err5:
+ platform_device_unregister(exynos->usb2_phy);
+ platform_device_unregister(exynos->usb3_phy);
err4:
regulator_disable(exynos->vdd10);
err3:
err4:
regulator_disable(exynos->vdd10);
err3: