diff options
| author | Len Brown <len.brown@intel.com> | 2008-03-18 05:17:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-03-18 05:17:15 -0400 |
| commit | 13d93924f13e1989cf27375cd46451475bc70d1d (patch) | |
| tree | 13b263ef89f15fe50ed0b93aff1322e092968d7f /drivers/acpi | |
| parent | d9ea1364d37b53710519909ab125a53b0a8ca64f (diff) | |
| parent | 9171f83488940e4ff85f1b7137773eb1f306cdef (diff) | |
Merge branches 'release' and 'dock' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/dock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 307cef65c247..fa44fb96fc34 100644 --- 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, | |||
| 710 | if (!count) | 710 | if (!count) |
| 711 | return -EINVAL; | 711 | return -EINVAL; |
| 712 | 712 | ||
| 713 | begin_undock(dock_station); | ||
| 713 | ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST); | 714 | ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST); |
| 714 | return ret ? ret: count; | 715 | return ret ? ret: count; |
| 715 | } | 716 | } |