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

platform/x86: intel-hid: 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-hid driver.

Fixes: ecc83e52 ("intel-hid: new hid event driver for hotkeys")
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/1971512.tdWV9SEqCh@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 abfbe5ee

drivers/platform/x86/intel/hid.c

+5 −1
Original line number Diff line number Diff line
@@ -688,12 +688,16 @@ static bool button_array_present(struct platform_device *device) 


static int intel_hid_probe(struct platform_device *device)

{

	acpi_handle handle = ACPI_HANDLE(&device->dev);

	unsigned long long mode, dummy;

	struct intel_hid_priv *priv;

	acpi_handle handle;

	acpi_status status;

	int err;



	handle = ACPI_HANDLE(&device->dev);

	if (!handle)

		return -ENODEV;



	intel_hid_init_dsm(handle);



	if (!intel_hid_evaluate_method(handle, INTEL_HID_DSM_HDMM_FN, &mode)) {