summaryrefslogtreecommitdiffstats
path: root/sys/dev/ic/rtsx.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2013-05-31 21:28:31 +0000
committerderaadt <deraadt@openbsd.org>2013-05-31 21:28:31 +0000
commit00c76a70b005bc9dfcc56812a9b4915ff8b3093c (patch)
treeec7563e843e9e8fe945fffcd6b7f47006bde1301 /sys/dev/ic/rtsx.c
parentdoesn't need any headers (diff)
downloadwireguard-openbsd-00c76a70b005bc9dfcc56812a9b4915ff8b3093c.tar.xz
wireguard-openbsd-00c76a70b005bc9dfcc56812a9b4915ff8b3093c.zip
Correct sequencing in ca_activate function. Some operations were in the
wrong order, and depth traversal was not gauranteed. ok stsp (tested too)
Diffstat (limited to '')
-rw-r--r--sys/dev/ic/rtsx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/ic/rtsx.c b/sys/dev/ic/rtsx.c
index cb5b0eca72a..a584d6a7ca9 100644
--- a/sys/dev/ic/rtsx.c
+++ b/sys/dev/ic/rtsx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtsx.c,v 1.3 2013/03/28 20:03:19 stsp Exp $ */
+/* $OpenBSD: rtsx.c,v 1.4 2013/05/31 21:28:31 deraadt Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -283,12 +283,11 @@ rtsx_activate(struct device *self, int act)
switch (act) {
case DVACT_QUIESCE:
- /* XXX abort commands in progress? */
rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
- rtsx_save_regs(sc);
rv = config_activate_children(self, act);
+ rtsx_save_regs(sc);
break;
case DVACT_POWERDOWN:
rv = config_activate_children(self, act);