From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Wentao Liang <vulab@iscas.ac.cn>
Cc: hmh@hmh.eng.br, Hans de Goede <hdegoede@redhat.com>,
ibm-acpi-devel@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
stable@vger.kernel.org
Subject: Re: [PATCH v2] platform/x86: thinkpad-acpi: Add error check for tpacpi_check_quirks()
Date: Mon, 7 Apr 2025 19:30:47 +0300 (EEST) [thread overview]
Message-ID: <32dfd23a-7fa2-77d7-b4e5-3cfa90933ff5@linux.intel.com> (raw)
In-Reply-To: <20250407135808.2486-1-vulab@iscas.ac.cn>
On Mon, 7 Apr 2025, Wentao Liang wrote:
> In tpacpi_battery_init(), the return value of tpacpi_check_quirks() needs
> to be checked. The battery should not be hooked if there is no matched
> battery information in quirk table.
>
> Add an error check and return -ENODEV immediately if the device fail
> the check.
>
> Fixes: 1a32ebb26ba9 ("platform/x86: thinkpad_acpi: Support battery quirk")
> Cc: stable@vger.kernel.org
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
> ---
> v2: Fix double assignment error.
>
> drivers/platform/x86/thinkpad_acpi.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index 2cfb2ac3f465..93eaca3bd9d1 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -9973,7 +9973,9 @@ static int __init tpacpi_battery_init(struct ibm_init_struct *ibm)
>
> tp_features.battery_force_primary = tpacpi_check_quirks(
> battery_quirk_table,
> - ARRAY_SIZE(battery_quirk_table));
> + ARRAY_SIZE(battery_quirk_table))
Fine, using the same variable is okay but this will fail build as remove
that semicolon.
> + if (!tp_features.battery_force_primary)
> + return -ENODEV;
>
> battery_hook_register(&battery_hook);
> return 0;
>
--
i.
prev parent reply other threads:[~2025-04-07 16:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-07 13:58 [PATCH v2] platform/x86: thinkpad-acpi: Add error check for tpacpi_check_quirks() Wentao Liang
2025-04-07 16:30 ` Ilpo Järvinen [this message]
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=32dfd23a-7fa2-77d7-b4e5-3cfa90933ff5@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=hmh@hmh.eng.br \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=vulab@iscas.ac.cn \
/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.