From: Vishnu Sankar <vishnuocv@gmail.com>
To: ilpo.jarvinen@linux.intel.com, hansg@kernel.org, oliver@email.com
Cc: platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org,
ibm-acpi-devel@lists.sourceforge.net, mpearson-lenovo@squebb.ca,
vsankar@lenovo.com, Vishnu Sankar <vishnuocv@gmail.com>
Subject: [PATCH] platform/x86: thinkpad_acpi: Fix USB-C Security probe failure on unsupported platforms
Date: Sat, 11 Jul 2026 15:22:49 +0900 [thread overview]
Message-ID: <20260711062249.503264-1-vishnuocv@gmail.com> (raw)
On systems where the USCS ACPI method is absent, acpi_evalf() returns
AE_NOT_FOUND which maps to -EIO. This caused tpacpi_usbc_security_init()
to propagate the error and thinkpad_acpi failed to probe entirely on
unsupported platforms.
Fix this by checking for USCS method presence with acpi_has_method() before
attempting to call it, returning -ENODEV immediately if absent.
This follows the same pattern used by other subdrivers in thinkpad_acpi.c.
Fixes: 67e8d1e9cacd ("platform/x86: thinkpad_acpi: Add USB-C Security (USCS) support")
Reported-by: Oliver Lin <oliver@email.com>
Closes: https://lore.kernel.org/platform-driver-x86/239c8162-e1e6-4b49-8292-35547c5a525c@liuxiaozhen.dev/
Signed-off-by: Vishnu Sankar <vishnuocv@gmail.com>
---
drivers/platform/x86/lenovo/thinkpad_acpi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/platform/x86/lenovo/thinkpad_acpi.c b/drivers/platform/x86/lenovo/thinkpad_acpi.c
index 91db4c8eeac2..85ed506516f0 100644
--- a/drivers/platform/x86/lenovo/thinkpad_acpi.c
+++ b/drivers/platform/x86/lenovo/thinkpad_acpi.c
@@ -11368,6 +11368,9 @@ static int tpacpi_usbc_security_init(struct ibm_init_struct *iibm)
{
int err;
+ if (!acpi_has_method(hkey_handle, "USCS"))
+ return -ENODEV;
+
err = usbc_security_query(&tp_features.usbc_security_enabled);
if (err == -ENODEV)
return 0;
--
2.51.0
next reply other threads:[~2026-07-11 6:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-11 6:22 Vishnu Sankar [this message]
2026-07-12 3:50 ` [PATCH] platform/x86: thinkpad_acpi: Fix USB-C Security probe failure on unsupported platforms Oliver Lin
2026-07-13 9:48 ` Oliver Lin
2026-07-13 11:17 ` Ilpo Järvinen
2026-07-14 3:44 ` Vishnu Sankar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260711062249.503264-1-vishnuocv@gmail.com \
--to=vishnuocv@gmail.com \
--cc=hansg@kernel.org \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=mpearson-lenovo@squebb.ca \
--cc=oliver@email.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=vsankar@lenovo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.