Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 11650815 from 2c21455b27 to 24Q3-release

Browse source 
Change-Id: Ia7fafe083f1d6296a9f00fc39b3f6fc1bd6883fe
This commit is contained in:
Android Build Coastguard Worker 2024-03-30 21:03:43 +00:00
commit e7ac1387f9
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
usb/usb/Usb.cpp
View file

@ -1724,8 +1724,10 @@ void *displayPortPollWork(void *param) {
std::vector<PortStatus> currentPortStatus; std::vector<PortStatus> currentPortStatus;
ret = read(usb->mDisplayPortDebounceTimer, &res, sizeof(res)); ret = read(usb->mDisplayPortDebounceTimer, &res, sizeof(res));
ALOGI("usbdp: dp debounce triggered, val:%lu ret:%d", res, ret); ALOGI("usbdp: dp debounce triggered, val:%lu ret:%d", res, ret);
if (ret < 0) if (ret < 0) {
ALOGE("usbdp: debounce read errno:%d", errno); ALOGW("usbdp: debounce read error:%d", errno);
continue;
}
queryVersionHelper(usb, &currentPortStatus); queryVersionHelper(usb, &currentPortStatus);
} else if (events[n].data.fd == usb->mDisplayPortActivateTimer) { } else if (events[n].data.fd == usb->mDisplayPortActivateTimer) {
string activePartner, activePort; string activePartner, activePort;
@ -1776,6 +1778,7 @@ void *displayPortPollWork(void *param) {
error: error:
/* Need to disarm so new threads don't get old event */ /* Need to disarm so new threads don't get old event */
armTimerFdHelper(usb->mDisplayPortDebounceTimer, 0);
armTimerFdHelper(usb->mDisplayPortActivateTimer, 0); armTimerFdHelper(usb->mDisplayPortActivateTimer, 0);
close(link_training_status_fd); close(link_training_status_fd);
link_training_status_fd_error: link_training_status_fd_error: