Merge tag 'iwlwifi-next-for-kalle-2015-02-03' of https://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / usb / phy / phy-ulpi.c

diff --git a/drivers/usb/phy/phy-ulpi.c b/drivers/usb/phy/phy-ulpi.c
index 4e3877c329f2c2ba4387c47d8a8bb995400f0e99..f48a7a21e3c2f6ffa5c7ee17c05ef47619ae89d6 100644 (file)
--- a/drivers/usb/phy/phy-ulpi.c
+++ b/drivers/usb/phy/phy-ulpi.c
@@ -211,7 +211,7 @@ static int ulpi_init(struct usb_phy *phy)
 
 static int ulpi_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-       struct usb_phy *phy = otg->phy;
+       struct usb_phy *phy = otg->usb_phy;
        unsigned int flags = usb_phy_io_read(phy, ULPI_IFC_CTRL);
 
        if (!host) {
@@ -237,7 +237,7 @@ static int ulpi_set_host(struct usb_otg *otg, struct usb_bus *host)
 
 static int ulpi_set_vbus(struct usb_otg *otg, bool on)
 {
-       struct usb_phy *phy = otg->phy;
+       struct usb_phy *phy = otg->usb_phy;
        unsigned int flags = usb_phy_io_read(phy, ULPI_OTG_CTRL);
 
        flags &= ~(ULPI_OTG_CTRL_DRVVBUS | ULPI_OTG_CTRL_DRVVBUS_EXT);
@@ -276,7 +276,7 @@ otg_ulpi_create(struct usb_phy_io_ops *ops,
        phy->otg        = otg;
        phy->init       = ulpi_init;
 
-       otg->phy        = phy;
+       otg->usb_phy    = phy;
        otg->set_host   = ulpi_set_host;
        otg->set_vbus   = ulpi_set_vbus;