Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / drivers / usb / host / xhci-exynos5.c

diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 1146d101de40901d5789c342c3716a2f2a1b7aaf..b4946a3f1cf5900614e7238f8033979876eac942 100644 (file)
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -298,7 +298,8 @@ int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor)
 
 #ifdef CONFIG_OF_CONTROL
        /* setup the Vbus gpio here */
-       if (!fdtdec_setup_gpio(&ctx->vbus_gpio))
+       if (fdt_gpio_isvalid(&ctx->vbus_gpio) &&
+           !fdtdec_setup_gpio(&ctx->vbus_gpio))
                gpio_direction_output(ctx->vbus_gpio.gpio, 1);
 #endif