From 085a278826239cb5d5c947e6ebf2496b3623f1ca Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Sun, 16 Jun 2013 00:38:30 +0200
Subject: [PATCH] --- yaml --- r: 377272 b: refs/heads/master c:
 8112006f41fd76ddf4988f8ddd904563db85613c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fa7a19bf8cfe..2d9f44a617e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 204ebc0aa30a7115f300cac39fbb7eeb66524881
+refs/heads/master: 8112006f41fd76ddf4988f8ddd904563db85613c
diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c
index 4fdea381ef21..ec117c6c996c 100644
--- a/trunk/drivers/acpi/dock.c
+++ b/trunk/drivers/acpi/dock.c
@@ -868,8 +868,10 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
 	if (!count)
 		return -EINVAL;
 
+	acpi_scan_lock_acquire();
 	begin_undock(dock_station);
 	ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
+	acpi_scan_lock_release();
 	return ret ? ret: count;
 }
 static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);