ACPI: bus: Fix MFD child automatic modprobe issue
PATCH 1/1 ACPI: bus: Fix MFD child automatic modprobe issue
MFD child devices sharing parent's ACPI Companion fails to probe as acpi_companion_match() returns incompatible ACPI Companion handle for binding with the check for pnp.type.backlight added recently. Remove this pnp.type.backlight check in acpi_companion_match() to fix the automatic modprobe issue.
--- drivers/acpi/bus.c | 3 --- 1 file changed, 3 deletions(-)
drivers/acpi/bus.c +0 -3
@@ -818,9 +818,6 @@ const struct acpi_device *acpi_companion_match(const struct device *dev)if (list_empty (&adev->pnp.ids))return NULL ; -if (adev->pnp.type.backlight) -return adev; -return acpi_primary_dev_companion (adev, dev); }
Signature · 1 line
2.43.0
Rafael J. Wysocki
maintainerQuoted 18 lines · Pratap Nirujogi
MFD child devices sharing parent's ACPI Companion fails to probe as
acpi_companion_match()returns incompatible ACPI Companion handle for binding with the check for pnp.type.backlight added recently. Remove this pnp.type.backlight check inacpi_companion_match()to fix the automatic modprobe issue.Fixes 7a7a7ed5f8bdb ("ACPI: scan: Register platform devices for backlight device objects")Signed-off-by Pratap Nirujogi <[email protected]>--- drivers/acpi/bus.c | 3 --- 1 file changed, 3 deletions(-)drivers/acpi/bus.c +0
-0
drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev) · line 823
Quoted 6 lines
drivers/acpi/bus.c +0
-3@@ -818,9 +818,6 @@ const struct acpi_device *acpi_companion_match(const struct device *dev)if (list_empty (&adev->pnp.ids))return NULL ; -if (adev->pnp.type.backlight) -return adev; -
Good catch!
I forgot to remove this in
drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev)
Quoted 4 lines
drivers/acpi/bus.c +0
-1return acpi_primary_dev_companion (adev, dev); } --
So applied as 7.0-rc material, thanks!
Quoted 33 lines · Rafael J. Wysocki
Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
Quoted 18 lines · Pratap Nirujogi
MFD child devices sharing parent's ACPI Companion fails to probe as
acpi_companion_match()returns incompatible ACPI Companion handle for binding with the check for pnp.type.backlight added recently. Remove this pnp.type.backlight check inacpi_companion_match()to fix the automatic modprobe issue.Fixes 7a7a7ed5f8bdb ("ACPI: scan: Register platform devices for backlight device objects")Signed-off-by Pratap Nirujogi <[email protected]>--- drivers/acpi/bus.c | 3 --- 1 file changed, 3 deletions(-)drivers/acpi/bus.c +0
-0drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev) · line 823
Quoted 6 lines
drivers/acpi/bus.c +0
-3@@ -818,9 +818,6 @@ const struct acpi_device *acpi_companion_match(const struct device *dev)if (list_empty (&adev->pnp.ids))return NULL ; -if (adev->pnp.type.backlight) -return adev; -Good catch!
I forgot to remove this in
Quoted 8 lines
drivers/acpi/bus.c const struct acpi_device *acpi_companion_match(const struct device *dev)
Quoted 4 lines
drivers/acpi/bus.c +0
-1return acpi_primary_dev_companion (adev, dev); } --So applied as 7.0-rc material, thanks!
Thanks, Rafael.