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

Fixes: 8a44bd3ffdb2 ("platform/x86: intel/smartconnect: 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/7956676.EvYhyI6sBW@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/intel/smartconnect.c

index 4d866b6366d695566a481dd5769277112b4abc81..71e91ac60e5da25e122b2e9be3758ce393549dbb 100644 (file)
@@ -12,10 +12,14 @@ MODULE_LICENSE("GPL");
 
 static int smartconnect_acpi_probe(struct platform_device *pdev)
 {
-       acpi_handle handle = ACPI_HANDLE(&pdev->dev);
        unsigned long long value;
+       acpi_handle handle;
        acpi_status status;
 
+       handle = ACPI_HANDLE(&pdev->dev);
+       if (!handle)
+               return -ENODEV;
+
        status = acpi_evaluate_integer(handle, "GAOS", NULL, &value);
        if (ACPI_FAILURE(status))
                return -EINVAL;