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

platform/x86: sony-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 requisite ACPI_COMPANION() checks against NULL to the
platform/x86 sony-laptop driver.

Fixes: 138db7ee ("platform/x86: sony-laptop: Convert PIC driver to a platform one")
Fixes: 14004dd3 ("platform/x86: sony-laptop: Convert NC 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/1871155.VLH7GnMWUR@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 f15b0a30

drivers/platform/x86/sony-laptop.c

+10 −2
Original line number Diff line number Diff line
@@ -3147,11 +3147,15 @@ static void sony_nc_backlight_cleanup(void) 


static int sony_nc_probe(struct platform_device *pdev)

{

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

	struct acpi_device *device;

	acpi_status status;

	int result = 0;

	struct sony_nc_value *item;



	device = ACPI_COMPANION(&pdev->dev);

	if (!device)

		return -ENODEV;



	sony_nc_acpi_device = device;

	strscpy(acpi_device_class(device), "sony/hotkey");
@@ -4509,11 +4513,15 @@ static void sony_pic_remove(struct platform_device *pdev) 


static int sony_pic_probe(struct platform_device *pdev)

{

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

	struct sony_pic_ioport *io, *tmp_io;

	struct sony_pic_irq *irq, *tmp_irq;

	struct acpi_device *device;

	int result;



	device = ACPI_COMPANION(&pdev->dev);

	if (!device)

		return -ENODEV;



	spic_dev.acpi_dev = device;

	strscpy(acpi_device_class(device), "sony/hotkey");

	sony_pic_detect_device_type(&spic_dev);