Skip to content

Commit 840bcd6

Browse files
rafaeljwij-intel
authored andcommitted
platform/x86: system76: 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 system76 driver. Fixes: 80b8f68 ("platform/x86: system76: 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/2072699.usQuhbGJ8B@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 f2ec693 commit 840bcd6

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/platform/x86/system76_acpi.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,14 @@ static void system76_notify(acpi_handle handle, u32 event, void *context)
674674
// Probe a System76 platform device
675675
static int system76_probe(struct platform_device *pdev)
676676
{
677-
struct acpi_device *acpi_dev = ACPI_COMPANION(&pdev->dev);
677+
struct acpi_device *acpi_dev;
678678
struct system76_data *data;
679679
int err;
680680

681+
acpi_dev = ACPI_COMPANION(&pdev->dev);
682+
if (!acpi_dev)
683+
return -ENODEV;
684+
681685
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
682686
if (!data)
683687
return -ENOMEM;

0 commit comments

Comments
 (0)