From e5b2423df5ac235819450c6abf105f046c068bf9 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Sat, 27 Feb 2016 01:59:45 +0200 Subject: [PATCH] musb: adjust vbus workaround ulpi write after 3.2.76 3.2 stable commit fff91a21b merged 705e63d2b29c8bbf091119084544d353bda70393 which swapped reg/val order --- drivers/usb/musb/musb_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index fe1d5c5de2bc..2e9b5fff698b 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1854,8 +1854,9 @@ static void musb_vbus_workaround_work(struct work_struct *work) (devctl & MUSB_DEVCTL_VBUS) != (3 << MUSB_DEVCTL_VBUS_SHIFT) && (devctl & MUSB_DEVCTL_VBUS) != (0 << MUSB_DEVCTL_VBUS_SHIFT)) { dev_dbg(musb->controller, "VBUS workaround..\n"); - ret = musb_ulpi_access.write(musb->xceiv, ULPI_SET(ULPI_OTG_CTRL), - ULPI_OTG_CTRL_DM_PULLDOWN | ULPI_OTG_CTRL_DP_PULLDOWN); + ret = musb_ulpi_access.write(musb->xceiv, + ULPI_OTG_CTRL_DM_PULLDOWN | ULPI_OTG_CTRL_DP_PULLDOWN, + ULPI_SET(ULPI_OTG_CTRL)); //if (ret) // dev_err(musb->controller, "VBUS workaround error\n"); } -- 2.39.2