ACPI / scan: Avoid enumerating devices more than once
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 16 Apr 2017 23:20:48 +0000 (01:20 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 19 Apr 2017 20:57:04 +0000 (22:57 +0200)
acpi_bus_attach() does not check the visited flag for devices that
have been enumerated already and some of them may be enumerated
for multiple times as a result, because some callers of
acpi_bus_scan() don't check the visited flag either.

For this reason, modify acpi_bus_attach() to check the visited flag
and avoid enumerating devices that have already been enumerated.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Joey Lee <jlee@suse.com>
drivers/acpi/scan.c

index f74bc0d286923edfbe2e9c046f774fc955a1bee9..c269310674158fa56104bdf4d7b4a04dcfda6221 100644 (file)
@@ -1840,6 +1840,8 @@ static void acpi_bus_attach(struct acpi_device *device)
                        device->flags.power_manageable = 0;
 
                device->flags.initialized = true;
+       } else if (device->flags.visited) {
+               goto ok;
        }
 
        ret = acpi_scan_attach_handler(device);