summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorphitran <none@none>2007-04-29 21:15:25 -0700
committerphitran <none@none>2007-04-29 21:15:25 -0700
commit65462502d1f85f840b3ca3e75e3105d39ff3a8df (patch)
treeeb8997621722e130279511e33d01d58f23e563c1 /usr/src
parent39542a1859e71f75c515c0165cdc87ccdda92beb (diff)
downloadillumos-gate-65462502d1f85f840b3ca3e75e3105d39ff3a8df.tar.gz
6550517 Battery panic on shutdown
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/i86pc/io/battery/battery.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/i86pc/io/battery/battery.c b/usr/src/uts/i86pc/io/battery/battery.c
index 1404c294de..1f0e7a049b 100644
--- a/usr/src/uts/i86pc/io/battery/battery.c
+++ b/usr/src/uts/i86pc/io/battery/battery.c
@@ -1329,8 +1329,8 @@ batt_cbat_notify(ACPI_HANDLE hdl, UINT32 val, void *ctx)
char *ev;
acpi_bst_t *bst;
- mutex_enter(&batt_mutex);
BATT_PRT_NOTIFY(hdl, val);
+ mutex_enter(&batt_mutex);
switch (val) {
/*
@@ -1476,12 +1476,12 @@ batt_ac_notify(ACPI_HANDLE hdl, UINT32 val, void *ctx)
char *ev;
int eval;
- mutex_enter(&batt_mutex);
BATT_PRT_NOTIFY(hdl, val);
-
if (val != 0x80) {
return;
}
+ mutex_enter(&batt_mutex);
+
/*
* Note: if unplug and then quickly plug back, two ADD
* events will be generated.