diff options
author | Greg Kroah-Hartman | 2012-03-12 17:13:31 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-03-12 17:13:31 +0100 |
commit | f7a0d426f3e7ec321b8037238b6426566df36edb (patch) | |
tree | 505e7d0264500db94534f1226684f78af7757289 /drivers/usb/gadget/ci13xxx_msm.c | |
parent | Linux 3.3-rc7 (diff) | |
parent | USB: serial: use module_driver() macro (diff) | |
download | kernel-qcow2-linux-f7a0d426f3e7ec321b8037238b6426566df36edb.tar.gz kernel-qcow2-linux-f7a0d426f3e7ec321b8037238b6426566df36edb.tar.xz kernel-qcow2-linux-f7a0d426f3e7ec321b8037238b6426566df36edb.zip |
Merge 3.3-rc7 into usb-next
This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/ci13xxx_msm.c')
-rw-r--r-- | drivers/usb/gadget/ci13xxx_msm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/ci13xxx_msm.c b/drivers/usb/gadget/ci13xxx_msm.c index 1fc612914c52..d07e44c05e9b 100644 --- a/drivers/usb/gadget/ci13xxx_msm.c +++ b/drivers/usb/gadget/ci13xxx_msm.c @@ -37,10 +37,10 @@ static void ci13xxx_msm_notify_event(struct ci13xxx *udc, unsigned event) * Put the transceiver in non-driving mode. Otherwise host * may not detect soft-disconnection. */ - val = otg_io_read(udc->transceiver, ULPI_FUNC_CTRL); + val = usb_phy_io_read(udc->transceiver, ULPI_FUNC_CTRL); val &= ~ULPI_FUNC_CTRL_OPMODE_MASK; val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING; - otg_io_write(udc->transceiver, val, ULPI_FUNC_CTRL); + usb_phy_io_write(udc->transceiver, val, ULPI_FUNC_CTRL); break; default: dev_dbg(dev, "unknown ci13xxx_udc event\n"); |