shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a8aea20e19ead970a19154695905079cd81ded6b' into develop-3.0

Browse Source
This commit is contained in:
yangkai
2012-10-16 15:53:18 +08:00
parent 746d83aac7 a8aea20e19
commit 7d6e91f3b9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/dwc_otg/dwc_otg_pcd.c
View File

@@ -1820,7 +1820,6 @@ static void dwc_otg_pcd_check_vbus_timer( unsigned long data )
if(_pcd->conn_status)
{
_pcd->conn_status = 0;
dwc_otg_msc_unlock(_pcd);
}
else if( pldata->phy_status == USB_PHY_ENABLED )
{
@@ -1831,6 +1830,8 @@ static void dwc_otg_pcd_check_vbus_timer( unsigned long data )
/* usb phy bypass to uart mode */
if( pldata->dwc_otg_uart_mode != NULL )
pldata->dwc_otg_uart_mode( pldata, PHY_UART_MODE);
/* release wake lock */
dwc_otg_msc_unlock(_pcd);
}
}
add_timer(&_pcd->check_vbus_timer);