---

yaml --- r: 377272 b: refs/heads/master c: 8112006 h: refs/heads/master v: v3
git-mirror · Jun 19, 2013 · 085a278 · 085a278
1 parent 04478ad
commit 085a278
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: 204ebc0aa30a7115f300cac39fbb7eeb66524881
+refs/heads/master: 8112006f41fd76ddf4988f8ddd904563db85613c
diff --git 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);