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

Merge "usb: handle displayport debounce timer empty reads" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-03-30 00:41:50 +00:00 • committed by Android (Google) Code Review
commit 2c21455b27
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;
ret = read(usb->mDisplayPortDebounceTimer, &res, sizeof(res));
ALOGI("usbdp: dp debounce triggered, val:%lu ret:%d", res, ret);
if (ret < 0)
ALOGE("usbdp: debounce read errno:%d", errno);
if (ret < 0) {
ALOGW("usbdp: debounce read error:%d", errno);
continue;
}
queryVersionHelper(usb, &currentPortStatus);
} else if (events[n].data.fd == usb->mDisplayPortActivateTimer) {
string activePartner, activePort;
@ -1776,6 +1778,7 @@ void *displayPortPollWork(void *param) {
error:
/* Need to disarm so new threads don't get old event */
armTimerFdHelper(usb->mDisplayPortDebounceTimer, 0);
armTimerFdHelper(usb->mDisplayPortActivateTimer, 0);
close(link_training_status_fd);
link_training_status_fd_error: