mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
sonypi: Check ACPI_COMPANION() against NULL at probe time
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
sonypi driver.
Fixes: 7e488b0af0 ("sonypi: Convert ACPI driver to a platform one")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/5087721.GXAFRqVoOG@rafael.j.wysocki
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
fa5e295234
commit
950f35211b
|
|
@ -1117,7 +1117,11 @@ static int sonypi_disable(void)
|
|||
#ifdef CONFIG_ACPI
|
||||
static int sonypi_acpi_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
|
||||
struct acpi_device *device;
|
||||
|
||||
device = ACPI_COMPANION(&pdev->dev);
|
||||
if (!device)
|
||||
return -ENODEV;
|
||||
|
||||
sonypi_acpi_device = device;
|
||||
strcpy(acpi_device_name(device), "Sony laptop hotkeys");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user