Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[karo-tx-linux.git] / arch / arm / plat-s5p / dev-ehci.c

diff --git a/arch/arm/plat-s5p/dev-ehci.c b/arch/arm/plat-s5p/dev-ehci.c
index a610e5c609648d70a452ab4c8be15ff626b8a915..94080fff9e9bda92607558855d4ab89fad9444ad 100644 (file)
--- a/arch/arm/plat-s5p/dev-ehci.c
+++ b/arch/arm/plat-s5p/dev-ehci.c
@@ -45,6 +45,13 @@ struct platform_device s5p_device_ehci = {
 
 void __init s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd)
 {
-       s3c_set_platdata(pd, sizeof(struct s5p_ehci_platdata),
+       struct s5p_ehci_platdata *npd;
+
+       npd = s3c_set_platdata(pd, sizeof(struct s5p_ehci_platdata),
                        &s5p_device_ehci);
+
+       if (!npd->phy_init)
+               npd->phy_init = s5p_usb_phy_init;
+       if (!npd->phy_exit)
+               npd->phy_exit = s5p_usb_phy_exit;
 }