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>
This commit is contained in:
parent
ed86e1fa7b
commit
5bd963ff48
@ -315,18 +315,14 @@ static int acpi_scan_device_check(struct acpi_device *adev)
|
|||||||
* again).
|
* again).
|
||||||
*/
|
*/
|
||||||
if (adev->handler) {
|
if (adev->handler) {
|
||||||
dev_warn(&adev->dev, "Already enumerated\n");
|
dev_dbg(&adev->dev, "Already enumerated\n");
|
||||||
return -EALREADY;
|
return 0;
|
||||||
}
|
}
|
||||||
error = acpi_bus_scan(adev->handle);
|
error = acpi_bus_scan(adev->handle);
|
||||||
if (error) {
|
if (error) {
|
||||||
dev_warn(&adev->dev, "Namespace scan failure\n");
|
dev_warn(&adev->dev, "Namespace scan failure\n");
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
if (!adev->handler) {
|
|
||||||
dev_warn(&adev->dev, "Enumeration failure\n");
|
|
||||||
error = -ENODEV;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
error = acpi_scan_device_not_present(adev);
|
error = acpi_scan_device_not_present(adev);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user