platform/x86: intel-vbtn: Check ACPI_HANDLE() against NULL

[ Upstream commit a9f305c5a355efeb240d406d378491d9eec02d07 ]

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

Fixes: 26173179fae1 ("platform/x86: intel-vbtn: Eval VBDL after registering our notifier")
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/3426431.aeNJFYEL58@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>

diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel/vbtn.c
index a353e830b65fd1c3f2082aa2950a608895592873..d64aac2895f37f50b4a586361d1957f920ab3be1 100644 (file)
--- a/drivers/platform/x86/intel/vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -275,12 +275,16 @@ static bool intel_vbtn_has_switches(acpi_handle handle, bool dual_accel)
 
 static int intel_vbtn_probe(struct platform_device *device)
 {
-       acpi_handle handle = ACPI_HANDLE(&device->dev);
        bool dual_accel, has_buttons, has_switches;
        struct intel_vbtn_priv *priv;
+       acpi_handle handle;
        acpi_status status;
        int err;
 
+       handle = ACPI_HANDLE(&device->dev);
+       if (!handle)
+               return -ENODEV;
+
        dual_accel = dual_accel_detect();
        has_buttons = acpi_has_method(handle, "VBDL");
        has_switches = intel_vbtn_has_switches(handle, dual_accel);