Skip to content

fix: strip input suffix from m_SysPath on mismatch #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tianming-1996 wants to merge 1 commit into
base: release/eagle
Choose a base branch
from
+7 −0
Open

fix: strip input suffix from m_SysPath on mismatch #736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,13 @@ bool DeviceInput::getPS2Syspath(const QString &dfs)
}
}

// 匹配失败时 m_SysPath 仍保留 hwinfo 原始 SysFS ID（含 /input/inputN 或 /inputN 后缀），
// 需剥离后缀得到正确设备 syspath，否则 wakeupPath() 等会拼出错误路径
if (m_SysPath.contains("i2c_designware"))
m_SysPath.remove(QRegExp("/input/input[0-9]{1,2}$"));
else
m_SysPath.remove(QRegExp("/input[0-9]{1,2}$"));

return true;
}

Expand Down
Loading