]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/chrome: chromeos_tbmc: Check ACPI_COMPANION()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 May 2026 16:35:54 +0000 (18:35 +0200)
committerTzung-Bi Shih <tzungbi@kernel.org>
Wed, 13 May 2026 02:19:46 +0000 (02:19 +0000)
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
chromeos_tbmc driver.

Fixes: a2676ead257f ("platform/chrome: chromeos_tbmc: Convert to a platform driver")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/1875121.VLH7GnMWUR@rafael.j.wysocki
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
drivers/platform/chrome/chromeos_tbmc.c

index 5133806b2d958730a2f4193e1d13cc641603a958..fd756761a481f49b3c45b2cba5c6df3399871099 100644 (file)
@@ -69,9 +69,13 @@ static int chromeos_tbmc_probe(struct platform_device *pdev)
 {
        struct input_dev *idev;
        struct device *dev = &pdev->dev;
-       struct acpi_device *adev = ACPI_COMPANION(dev);
+       struct acpi_device *adev;
        int ret;
 
+       adev = ACPI_COMPANION(dev);
+       if (!adev)
+               return -ENODEV;
+
        idev = devm_input_allocate_device(dev);
        if (!idev)
                return -ENOMEM;