Unverified Commit a9f305c5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Ilpo Järvinen
Browse files

platform/x86: intel-vbtn: Check ACPI_HANDLE() 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_HANDLE() check against NULL to the
platform/x86 intel-vbtn driver.

Fixes: 26173179 ("platform/x86: intel-vbtn: Eval VBDL after registering our notifier")
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/3426431.aeNJFYEL58@rafael.j.wysocki


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 2765f16c

drivers/platform/x86/intel/vbtn.c

+5 −1
Original line number Diff line number Diff line
@@ -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);