---

yaml --- r: 350975 b: refs/heads/master c: 5f27ee8 h: refs/heads/master i: 350973: f917a6f 350971: b486b0a 350967: b02cf81 350959: a0a35c3 350943: 513d381 350911: d81a1fa 350847: 21bf59e 350719: 15e90ca v: v3
git-mirror · Feb 13, 2013 · dec9faa · dec9faa
1 parent 455b845
commit dec9faa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 			}
 		}