diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-01 10:27:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-01 10:27:25 +0200 |
| commit | bc32134c0523c60989d2f2439e176601668a62a5 (patch) | |
| tree | 03f63fc387e78592968a1f04ee4e173ca32fec20 /drivers/acpi/dock.c | |
| parent | 1c6770a38a6652777b9d1592b66e0d8e7dfb6160 (diff) | |
| parent | 066624c6a1733a72a67f1d06d35a2153e7d9082b (diff) | |
Merge branch 'for-next' into for-linus
Merge the whole changes for 3.11-rc1 merge
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 4fdea381ef2..ec117c6c996 100644 --- a/drivers/acpi/dock.c +++ b/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); |