From dec9faab4845dd47cb1f9561a98312f132193151 Mon Sep 17 00:00:00 2001
From: Toshi Kani <toshi.kani@hp.com>
Date: Thu, 7 Feb 2013 21:19:13 +0000
Subject: [PATCH] --- yaml --- r: 350975 b: refs/heads/master c:
 5f27ee8e1261e47ec2e9dbebf17e87e55f568d75 h: refs/heads/master i:   350973:
 f917a6faaf1ed8bfb13e1f29a9cf00c07a098c63   350971:
 b486b0afcd3b98abdabba234e9e93cdf9bb6bffb   350967:
 b02cf81f1b7f13069b220a1147ce3be559401b48   350959:
 a0a35c3f94bbd80a4cdf926ae0c80a97c721a081   350943:
 513d381b8142f742de3884f8f38485dcbfc57f69   350911:
 d81a1fafaca3a645480542978cd8804e58cea018   350847:
 21bf59e79be77a698fa3262de647afe8509b7e96   350719:
 15e90ca390e15325fc635f9e13a513ddf7bbb290 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/scan.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cec74afe4d45..08e3426a6e1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce7685ad764f070a9234df6a12a17eb92471d126
+refs/heads/master: 5f27ee8e1261e47ec2e9dbebf17e87e55f568d75
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 95547efcffe0..bf6e2c26f52d 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/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;
 			}
 		}