]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86: adv_swbutton: Check ACPI_HANDLE() against NULL
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 May 2026 15:11:49 +0000 (17:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jun 2026 15:46:31 +0000 (17:46 +0200)
[ Upstream commit e7a9a6ea40e352cd7977f6a8c80bdeadf65ad838 ]

Every platform driver can be forced to match a device that doesn't match
its list of device IDs because of device_match_driver_override(), so
platform drivers that rely on the existence of a device's ACPI companion
object need to verify its presence.

Accordingly, add a requisite ACPI_HANDLE() check against NULL to the
platform/x86 adv_swbutton driver.

Fixes: 3d904005f686 ("platform/x86: add support for Advantech software defined button")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/5115425.31r3eYUQgx@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/adv_swbutton.c

index 6b23ba78e028f852721ee619f445b6fef9fb886f..f7bc252650d5ae18a2165b8ae8c82bff8fe1ccf3 100644 (file)
@@ -48,10 +48,14 @@ static int adv_swbutton_probe(struct platform_device *device)
 {
        struct adv_swbutton *button;
        struct input_dev *input;
-       acpi_handle handle = ACPI_HANDLE(&device->dev);
+       acpi_handle handle;
        acpi_status status;
        int error;
 
+       handle = ACPI_HANDLE(&device->dev);
+       if (!handle)
+               return -ENODEV;
+
        button = devm_kzalloc(&device->dev, sizeof(*button), GFP_KERNEL);
        if (!button)
                return -ENOMEM;