| commit | 217336cad0c0d98bb32cb781bb13c1a07f5a203c | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri Mar 28 06:09:22 2014 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri Mar 28 06:09:19 2014 -0700 |
| tree | ded056603eeceb9dfdd1e7a9fc824f2a7f2f61c5 | |
| parent | 077bbad44bfffa161cdce7ecc2a755d6d9a36fce [diff] | |
| parent | 986dd7cbd3db30de0a51dee0fb35f1a189e7ebbc [diff] |
Merge "USB: phy-msm-usb: Disable charger detection block on DISCONNECT"
diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c index 1249575..350fd41 100644 --- a/drivers/usb/otg/msm_otg.c +++ b/drivers/usb/otg/msm_otg.c
@@ -2700,6 +2700,7 @@ /* Turn off VDP_SRC */ ulpi_write(otg->phy, 0x2, 0x86); } + msm_chg_block_off(motg); msm_otg_reset(otg->phy); /* * There is a small window where ID interrupt