diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-11-07 09:06:04 -0600 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-11-10 17:19:34 -0600 |
| commit | 8b9ca2767b2d1ea405287e530da3a7b234120b95 (patch) | |
| tree | bfb1f9ca56778cd5048e8b972b3d752e3bfab3b2 /drivers/phy | |
| parent | 004f7d457ef57d46ddf5f8380aa169214c166fca (diff) | |
| download | linux-8b9ca2767b2d1ea405287e530da3a7b234120b95.tar.gz linux-8b9ca2767b2d1ea405287e530da3a7b234120b95.tar.bz2 linux-8b9ca2767b2d1ea405287e530da3a7b234120b95.zip | |
phy: twl4030: Fix build breakage
commit e47d925 (usb: move the OTG state
from the USB PHY to the OTG structure) moved
the OTG state field from struct usb_phy to
struct usb_otg but, even though I fixed many
other build breakages, I still missed one
on phy-twl4030-usb.c.
Fix the build breakage now.
While at that, also a build warning introduced
by the same commit.
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/phy-twl4030-usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c index 7b04befd5271..e2698d29f436 100644 --- a/drivers/phy/phy-twl4030-usb.c +++ b/drivers/phy/phy-twl4030-usb.c @@ -606,7 +606,7 @@ static int twl4030_set_peripheral(struct usb_otg *otg, otg->gadget = gadget; if (!gadget) - otg->phy->state = OTG_STATE_UNDEFINED; + otg->state = OTG_STATE_UNDEFINED; return 0; } @@ -618,7 +618,7 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host) otg->host = host; if (!host) - otg->phy->state = OTG_STATE_UNDEFINED; + otg->state = OTG_STATE_UNDEFINED; return 0; } @@ -676,7 +676,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) twl->phy.otg = otg; twl->phy.type = USB_PHY_TYPE_USB2; - otg->phy = &twl->phy; + otg->usb_phy = &twl->phy; otg->set_host = twl4030_set_host; otg->set_peripheral = twl4030_set_peripheral; |