Skip to content

Commit 51e91ad

Browse files
rafaeljwij-intel
authored andcommitted
platform/x86: intel/rst: 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 intel/rst driver. Fixes: 163a68a ("platform/x86: intel/rst: 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/2051525.PYKUYFuaPT@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 ab743c6 commit 51e91ad

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

  • drivers/platform/x86/intel

drivers/platform/x86/intel/rst.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,13 @@ static struct device_attribute irst_timeout_attr = {
102102

103103
static int irst_probe(struct platform_device *pdev)
104104
{
105-
struct acpi_device *acpi = ACPI_COMPANION(&pdev->dev);
105+
struct acpi_device *acpi;
106106
int error;
107107

108+
acpi = ACPI_COMPANION(&pdev->dev);
109+
if (!acpi)
110+
return -ENODEV;
111+
108112
error = device_create_file(&acpi->dev, &irst_timeout_attr);
109113
if (unlikely(error))
110114
return error;

0 commit comments

Comments
 (0)