usb: phy-generic: fix nop xceiv probe
authorAaro Koskinen <aaro.koskinen@iki.fi>
Fri, 15 Nov 2013 19:38:50 +0000 (21:38 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 25 Nov 2013 16:25:59 +0000 (10:25 -0600)
Commit bd27fa44e13830d2baa278d5702e766380659cb3 (usb: phy: generic:
Don't use regulator framework for RESET line) introduced regression: All
users of usb_nop_xceiv_register() will fail because there is no platform
data and the default reset GPIO is 0 which is a valid GPIO. Fix that.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/phy/phy-generic.c

index 0c3b24124063869b6e9ecfda202981f8cb651ce1..8ee37f4035538350e645aa962c7fcf0979e9986a 100644 (file)
@@ -180,6 +180,8 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_gen_xceiv *nop,
                clk_rate = pdata->clk_rate;
                needs_vcc = pdata->needs_vcc;
                nop->gpio_reset = pdata->gpio_reset;
+       } else {
+               nop->gpio_reset = -1;
        }
 
        nop->phy.otg = devm_kzalloc(dev, sizeof(*nop->phy.otg),