Skip to content

Commit f15b0a3

Browse files
rafaeljwij-intel
authored andcommitted
platform/x86: panasonic-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 panasonic-laptop driver. Fixes: de68372 ("platform/x86: panasonic-laptop: Convert ACPI driver to a platform one") 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/3353471.5fSG56mABF@rafael.j.wysocki Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 7e16932 commit f15b0a3

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/platform/x86/panasonic-laptop.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,11 +981,15 @@ static int acpi_pcc_hotkey_resume(struct device *dev)
981981

982982
static int acpi_pcc_hotkey_probe(struct platform_device *pdev)
983983
{
984-
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
985984
struct backlight_properties props;
985+
struct acpi_device *device;
986986
struct pcc_acpi *pcc;
987987
int num_sifr, result;
988988

989+
device = ACPI_COMPANION(&pdev->dev);
990+
if (!device)
991+
return -ENODEV;
992+
989993
num_sifr = acpi_pcc_get_sqty(device);
990994

991995
/*

0 commit comments

Comments
 (0)