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