]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86: acer-wireless: Check ACPI_COMPANION() against NULL
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 May 2026 14:03:21 +0000 (16:03 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Wed, 20 May 2026 10:05:01 +0000 (13:05 +0300)
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_COMPANION() check against NULL to the
platform/x86 acer-wireless driver.

Fixes: f7e648027d7e ("platform/x86: acer-wireless: Convert ACPI driver to a platform one")
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/4746824.LvFx2qVVIh@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/acer-wireless.c

index f464b13a58afffbf96df900e10ed00e2e0d05f3b..fae8e5ad0f97c4273961045c301a48e65411e2e6 100644 (file)
@@ -37,9 +37,14 @@ static void acer_wireless_notify(acpi_handle handle, u32 event, void *data)
 
 static int acer_wireless_probe(struct platform_device *pdev)
 {
+       struct acpi_device *adev;
        struct input_dev *idev;
        int ret;
 
+       adev = ACPI_COMPANION(&pdev->dev);
+       if (!adev)
+               return -ENODEV;
+
        idev = devm_input_allocate_device(&pdev->dev);
        if (!idev)
                return -ENOMEM;
@@ -57,8 +62,7 @@ static int acer_wireless_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       return acpi_dev_install_notify_handler(ACPI_COMPANION(&pdev->dev),
-                                              ACPI_DEVICE_NOTIFY,
+       return acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
                                               acer_wireless_notify,
                                               &pdev->dev);
 }