Skip to content

Commit 08f29dc

Browse files
rafaeljwij-intel
authored andcommitted
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: ba19eb1 ("platform/x86: asus-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/5083741.GXAFRqVoOG@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 dc334b9 commit 08f29dc

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/platform/x86/asus-laptop.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1826,10 +1826,14 @@ static bool asus_device_present;
18261826

18271827
static int asus_acpi_probe(struct platform_device *pdev)
18281828
{
1829-
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
1829+
struct acpi_device *device;
18301830
struct asus_laptop *asus;
18311831
int result;
18321832

1833+
device = ACPI_COMPANION(&pdev->dev);
1834+
if (!device)
1835+
return -ENODEV;
1836+
18331837
pr_notice("Asus Laptop Support version %s\n",
18341838
ASUS_LAPTOP_VERSION);
18351839
asus = kzalloc_obj(struct asus_laptop);

0 commit comments

Comments
 (0)