diff options
author | Len Brown <len.brown@intel.com> | 2010-10-25 02:13:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-10-25 02:13:09 -0400 |
commit | 6e04c417aed5b0a5bd6ae80928bbd759fa1faabc (patch) | |
tree | be657ff1734320850c2ea37d4336b576f07dca31 /drivers/acpi/dock.c | |
parent | 880308089d0abebac365c3a1378b4e3238b100ac (diff) | |
parent | a210080195c95ebca2a517ee3057d71607aa65e0 (diff) | |
download | blackbird-op-linux-6e04c417aed5b0a5bd6ae80928bbd759fa1faabc.tar.gz blackbird-op-linux-6e04c417aed5b0a5bd6ae80928bbd759fa1faabc.zip |
Merge branch 'gpe-defer' into release
Diffstat (limited to 'drivers/acpi/dock.c')
-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 3fe29e992be8..44f99bd83741 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -725,6 +725,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data) complete_dock(ds); dock_event(ds, event, DOCK_EVENT); dock_lock(ds, 1); + acpi_update_gpes(); break; } if (dock_present(ds) || dock_in_progress(ds)) |