Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / i2c / i2c-core-acpi.c

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index d84095591e4549400799f76cf98e85f0f7ac5ba3..f86065e16772705058a77d6b34037d42b81e10de 100644 (file)
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -111,8 +111,7 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev,
        struct list_head resource_list;
        int ret;
 
-       if (acpi_bus_get_status(adev) || !adev->status.present ||
-           acpi_device_enumerated(adev))
+       if (acpi_bus_get_status(adev) || !adev->status.present)
                return -EINVAL;
 
        if (acpi_match_device_ids(adev, i2c_acpi_ignored_device_ids) == 0)
@@ -147,6 +146,9 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
        lookup.info = info;
        lookup.index = -1;
 
+       if (acpi_device_enumerated(adev))
+               return -EINVAL;
+
        ret = i2c_acpi_do_lookup(adev, &lookup);
        if (ret)
                return ret;