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

platform/x86: asus-laptop: 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 asus-laptop driver.

Fixes: ba19eb10 ("platform/x86: asus-laptop: Convert ACPI driver to a platform one")
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/5083741.GXAFRqVoOG@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 dc334b9b

drivers/platform/x86/asus-laptop.c

+5 −1
Original line number Diff line number Diff line
@@ -1826,10 +1826,14 @@ static bool asus_device_present; 


static int asus_acpi_probe(struct platform_device *pdev)

{

	struct acpi_device *device = ACPI_COMPANION(&pdev->dev);

	struct acpi_device *device;

	struct asus_laptop *asus;

	int result;



	device = ACPI_COMPANION(&pdev->dev);

	if (!device)

		return -ENODEV;



	pr_notice("Asus Laptop Support version %s\n",

		  ASUS_LAPTOP_VERSION);

	asus = kzalloc_obj(struct asus_laptop);