From: Toshi Kani <toshi.kani@hp.com>
Date: Thu, 7 Feb 2013 11:50:53 +0000 (+0100)
Subject: ACPI: sysfs eject support for ACPI scan handlers
X-Git-Tag: MMI-PSA29.97-13-9~14955^2~1^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce7685ad764f070a9234df6a12a17eb92471d126;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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;
 	}