From: Toshi Kani <toshi.kani@hp.com>
Date: Thu, 7 Feb 2013 21:19:13 +0000 (+0000)
Subject: ACPI: Unbind ACPI drv when probe failed
X-Git-Tag: v3.9-rc1~146^2~7^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f27ee8e1261e47ec2e9dbebf17e87e55f568d75;p=thirdparty%2Fkernel%2Flinux.git

ACPI: Unbind ACPI drv when probe failed

When acpi_device_install_notify_handler() failed in acpi_device_probe(),
it calls acpi_drv->ops.remove() and fails the probe.  However, the ACPI
driver is left bound to the acpi_device.  Fix it by clearing the driver
and driver_data fields.

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 95547efcffe02..bf6e2c26f52d3 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -627,6 +627,8 @@ static int acpi_device_probe(struct device * dev)
 			if (ret) {
 				if (acpi_drv->ops.remove)
 					acpi_drv->ops.remove(acpi_dev);
+				acpi_dev->driver = NULL;
+				acpi_dev->driver_data = NULL;
 				return ret;
 			}
 		}