diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-06-26 12:53:45 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-06-26 12:53:45 +0400 |
commit | ca02c216742c9e6aa6c4dce31a0be417bc6685b3 (patch) | |
tree | 7383e04dc0cf109f6b53ef0c9d0f0719128bbbbf /drivers/acpi/dock.c | |
parent | d908e1ebbc66a4a44469f27dcfb1f2f46144c4bf (diff) | |
parent | 0644414e62561f0ba1bea7c5ba6a94cc50dac3e3 (diff) | |
download | linux-ca02c216742c9e6aa6c4dce31a0be417bc6685b3.tar.xz |
Merge tag 'please-pull-mce-bitmap-comment' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull MCE updates from Tony Luck:
"Better comments so we understand our existing machine check
bank bitmaps - prelude to adding another bitmap soon."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 4fdea381ef21..ec117c6c996c 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); |