diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-11-15 20:38:50 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-11-25 17:25:59 +0100 |
| commit | dc52c57411ccad276af6b4f35a670773110b35c5 (patch) | |
| tree | c9ec2390576a5633a3994173b8ad527017e6eb04 | |
| parent | usb: fix musb gadget to enable OTG mode conditionally (diff) | |
| download | linux-dc52c57411ccad276af6b4f35a670773110b35c5.tar.xz linux-dc52c57411ccad276af6b4f35a670773110b35c5.zip | |
usb: phy-generic: fix nop xceiv probe
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>
| -rw-r--r-- | drivers/usb/phy/phy-generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c index 0c3b24124063..8ee37f403553 100644 --- a/drivers/usb/phy/phy-generic.c +++ b/drivers/usb/phy/phy-generic.c @@ -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), |