platform/x86: toshiba_haps: Check ACPI_COMPANION() against NULL

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

Fixes: 3a96c7915d93 ("platform/x86: toshiba_haps: 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/2285136.Mh6RI2rZIc@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/toshiba_haps.c b/drivers/platform/x86/toshiba_haps.c
index 1486252b5983b1ef3a83c2da6ef9f40a4dd45401..8d12241924df3d3bca6d64fdcf065cbc8522ff39 100644 (file)
--- a/drivers/platform/x86/toshiba_haps.c
+++ b/drivers/platform/x86/toshiba_haps.c
@@ -182,13 +182,17 @@ static int toshiba_haps_available(acpi_handle handle)
 
 static int toshiba_haps_probe(struct platform_device *pdev)
 {
-       struct acpi_device *acpi_dev = ACPI_COMPANION(&pdev->dev);
        struct toshiba_haps_dev *haps;
+       struct acpi_device *acpi_dev;
        int ret;
 
        if (toshiba_haps)
                return -EBUSY;
 
+       acpi_dev = ACPI_COMPANION(&pdev->dev);
+       if (!acpi_dev)
+               return -ENODEV;
+
        if (!toshiba_haps_available(acpi_dev->handle))
                return -ENODEV;