summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Rosenfeld <hans.rosenfeld@joyent.com>2019-03-17 17:01:18 +0100
committerHans Rosenfeld <hans.rosenfeld@joyent.com>2019-05-15 23:37:25 +0200
commita3380248e34d78eb55b8f65ccf1f0d8a6f7e7bbf (patch)
treecd1730f7271c6ca991bbedf4602fee2fb4c7d642
parent8f22c1dff63d6147c87d6bff65bcd3970ad4d368 (diff)
downloadillumos-joyent-a3380248e34d78eb55b8f65ccf1f0d8a6f7e7bbf.tar.gz
10055 recursive mutex enter in ahci
Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Randy Fishel <randyf@sibernet.com> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
-rw-r--r--usr/src/uts/common/io/sata/adapters/ahci/ahci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/sata/adapters/ahci/ahci.c b/usr/src/uts/common/io/sata/adapters/ahci/ahci.c
index d615f8dd62..918f95ff67 100644
--- a/usr/src/uts/common/io/sata/adapters/ahci/ahci.c
+++ b/usr/src/uts/common/io/sata/adapters/ahci/ahci.c
@@ -1203,8 +1203,6 @@ ahci_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
ahci_ctlp->ahcictl_flags |= AHCI_SUSPEND;
- ahci_em_suspend(ahci_ctlp);
-
/* stop the watchdog handler */
if (ahci_ctlp->ahcictl_timeout_id) {
(void) untimeout(ahci_ctlp->ahcictl_timeout_id);
@@ -1213,6 +1211,8 @@ ahci_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
mutex_exit(&ahci_ctlp->ahcictl_mutex);
+ ahci_em_suspend(ahci_ctlp);
+
/*
* drain the taskq
*/