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

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 hp_accel driver.

Fixes: 8ebcb6c94c71 ("platform/x86: hp_accel: Convert to be a platform driver")
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/2425918.ElGaqSPkdT@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/hp/hp_accel.c

index 52535576772ad8aad4fae3eccc0e8be8d0cffc68..aeedc77bed7fc50e8112309a9cac26f6910dce89 100644 (file)
@@ -300,6 +300,9 @@ static int lis3lv02d_probe(struct platform_device *device)
        int ret;
 
        lis3_dev.bus_priv = ACPI_COMPANION(&device->dev);
+       if (!lis3_dev.bus_priv)
+               return -ENODEV;
+
        lis3_dev.init = lis3lv02d_acpi_init;
        lis3_dev.read = lis3lv02d_acpi_read;
        lis3_dev.write = lis3lv02d_acpi_write;