Skip to content

L
linux-davinci
Commit 13d93924 authored by Len Brown's avatar Len Brown
Browse files
Options

Merge branches 'release' and 'dock' into release

parents d9ea1364 9171f834
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
drivers/acpi/dock.c
View file @ 13d93924
...@@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr, ...@@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
if (!count) if (!count)
return -EINVAL; return -EINVAL;
begin_undock(dock_station);
ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST); ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
return ret ? ret: count; return ret ? ret: count;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment