diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-02-26 17:35:27 +0100 |
---|---|---|
committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:22:35 -0400 |
commit | 3dd8bfb5f23fa1605f2a7b62c91258a7d778ccb1 (patch) | |
tree | 37e865e83f23542a89d7777833b6ce88a48395eb | |
parent | d6a0ddacb07986dbd08d97b8c8b0928778e318b4 (diff) | |
download | linux-stable-3dd8bfb5f23fa1605f2a7b62c91258a7d778ccb1.tar.gz linux-stable-3dd8bfb5f23fa1605f2a7b62c91258a7d778ccb1.tar.bz2 linux-stable-3dd8bfb5f23fa1605f2a7b62c91258a7d778ccb1.zip |
ACPI: scan: Fix device check notification handling
[ Upstream commit 793551c965116d9dfaf0550dacae1396a20efa69 ]
It is generally invalid to fail a Device Check notification if the scan
handler has not been attached to the given device after a bus rescan,
because there may be valid reasons for the scan handler to refuse
attaching to the device (for example, the device is not ready).
For this reason, modify acpi_scan_device_check() to return 0 in that
case without printing a warning.
While at it, reduce the log level of the "already enumerated" message
in the same function, because it is only interesting when debugging
notification handling
Fixes: 443fc8202272 ("ACPI / hotplug: Rework generic code to handle suprise removals")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | drivers/acpi/scan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 1e7e2c438acf..60417cee19b9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -321,18 +321,14 @@ static int acpi_scan_device_check(struct acpi_device *adev) * again). */ if (adev->handler) { - dev_warn(&adev->dev, "Already enumerated\n"); - return -EALREADY; + dev_dbg(&adev->dev, "Already enumerated\n"); + return 0; } error = acpi_bus_scan(adev->handle); if (error) { dev_warn(&adev->dev, "Namespace scan failure\n"); return error; } - if (!adev->handler) { - dev_warn(&adev->dev, "Enumeration failure\n"); - error = -ENODEV; - } } else { error = acpi_scan_device_not_present(adev); } |