Merge branches 'release' and 'dock' into release

DX37 · Mar 18, 2008 · 13d9392 · 13d9392
2 parents d9ea136 + 9171f83
commit 13d9392
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
@@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
 	if (!count)
 		return -EINVAL;
 
+	begin_undock(dock_station);
 	ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
 	return ret ? ret: count;
 }