ACPI / scan: Fix check of device_attach() return value.
authorMika Westerberg <mika.westerberg@linux.intel.com>
Fri, 11 Jan 2013 21:08:09 +0000 (22:08 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Jan 2013 21:08:09 +0000 (22:08 +0100)
Since device_attach() returns 1 on success (a driver has been bound
to the device), the check against its return value in
acpi_bus_device_attach() should modified to take that into accout.
Make it so.

[rjw: Subject and changelog.]
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/scan.c

index e380345b643a93f7797f7a3b427389f10a92707a..bac357da3f29283a7d9338eddc8637f64e1ea53a 100644 (file)
@@ -1593,7 +1593,7 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
        if (!acpi_match_device_ids(device, acpi_platform_device_ids)) {
                /* This is a known good platform device. */
                acpi_create_platform_device(device);
-       } else if (device_attach(&device->dev)) {
+       } else if (device_attach(&device->dev) < 0) {
                status = AE_CTRL_DEPTH;
        }
        return status;