diff options
| author |   Toshi Kani <toshi.kani@hp.com> | 2013-02-07 12:50:53 +0100 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-13 13:41:39 +0100 |
| commit | ce7685ad764f070a9234df6a12a17eb92471d126 (patch) | |
| tree | 704d5beefcb9aa01ddc70aea6d7f80d1fafcbced /drivers/acpi | |
| parent | ACPI / scan: Follow priorities of IDs when matching scan handlers (diff) | |
| download | linux-dev-ce7685ad764f070a9234df6a12a17eb92471d126.tar.xz linux-dev-ce7685ad764f070a9234df6a12a17eb92471d126.zip | |
ACPI: sysfs eject support for ACPI scan handlers
Changed sysfs eject, acpi_eject_store(), so that it doesn't return
error codes for devices nodes with ACPI scan handlers attached and
no ACPI drivers.
[rjw: Changelog]
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 688b7f7c23dd..95547efcffe0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -203,7 +203,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, return -EINVAL; } #ifndef FORCE_EJECT - if (acpi_device->driver == NULL) { + if (!acpi_device->driver && !acpi_device->handler) { ret = -ENODEV; goto err; } |