From 7fb2864005b9a72b9153167a2992adaec394bbde Mon Sep 17 00:00:00 2001 From: Roy Luo Date: Wed, 29 Jan 2025 01:58:44 +0000 Subject: [PATCH] usb: fix usb state path in host mode USB_DUMMY_HCD is disabled in kernel 6.1, modify the usb state path in host mode accordingly. Bug: 388367091 Test: test on oriole Flag: EXEMPT trivial bug fix Change-Id: If85077fddcadd25d15777d4b1ff5be2a0528c253 --- usb/usb/Usb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 3650c5b5..1ce07ab3 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -90,11 +90,11 @@ constexpr char kUdcUeventRegex[] = constexpr char kUdcStatePath[] = "/sys/devices/platform/11110000.usb/11110000.dwc3/udc/11110000.dwc3/state"; constexpr char kHost1UeventRegex[] = - "/devices/platform/11110000.usb/11110000.dwc3/xhci-hcd-exynos.[0-9].auto/usb2/2-0:1.0"; -constexpr char kHost1StatePath[] = "/sys/bus/usb/devices/usb2/2-0:1.0/usb2-port1/state"; + "/devices/platform/11110000.usb/11110000.dwc3/xhci-hcd-exynos.[0-9].auto/usb1/1-0:1.0"; +constexpr char kHost1StatePath[] = "/sys/bus/usb/devices/usb1/1-0:1.0/usb1-port1/state"; constexpr char kHost2UeventRegex[] = - "/devices/platform/11110000.usb/11110000.dwc3/xhci-hcd-exynos.[0-9].auto/usb3/3-0:1.0"; -constexpr char kHost2StatePath[] = "/sys/bus/usb/devices/usb3/3-0:1.0/usb3-port1/state"; + "/devices/platform/11110000.usb/11110000.dwc3/xhci-hcd-exynos.[0-9].auto/usb2/2-0:1.0"; +constexpr char kHost2StatePath[] = "/sys/bus/usb/devices/usb2/2-0:1.0/usb2-port1/state"; constexpr char kDataRolePath[] = "/sys/devices/platform/11110000.usb/new_data_role"; constexpr int kSamplingIntervalSec = 5; void queryVersionHelper(android::hardware::usb::Usb *usb,