From 2ae4de2fea0336de97ac762fdd355886b7315f34 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Wed, 10 Sep 2008 14:33:43 +0400
Subject: [PATCH] --- yaml --- r: 117368 b: refs/heads/master c:
 4b5fcb353ba46adfa2f98546e3d34e7dc65221cb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4632f1287f1a..a1b109b8210e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5000cadcf3188e935dae28c4fc7e24639704ea55
+refs/heads/master: 4b5fcb353ba46adfa2f98546e3d34e7dc65221cb
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index f6f52c1a2aba..e7b8853c310b 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -384,7 +384,7 @@ static int acpi_device_remove(struct device * dev)
 			acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type);
 	}
 	acpi_dev->driver = NULL;
-	acpi_driver_data(dev) = NULL;
+	acpi_driver_data(acpi_dev) = NULL;
 
 	put_device(dev);
 	return 0;