From owner-svn-src-head@FreeBSD.ORG  Sat Mar 29 18:56:12 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 31F0C12B;
 Sat, 29 Mar 2014 18:56:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DE21FE4;
 Sat, 29 Mar 2014 18:56:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TIuBOr029413;
 Sat, 29 Mar 2014 18:56:11 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TIuBQ5029412;
 Sat, 29 Mar 2014 18:56:11 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201403291856.s2TIuBQ5029412@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 29 Mar 2014 18:56:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263917 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Mar 2014 18:56:12 -0000

Author: adrian
Date: Sat Mar 29 18:56:11 2014
New Revision: 263917
URL: http://svnweb.freebsd.org/changeset/base/263917

Log:
  Fix ah_powerMode setting.
  
  Reported by:	sbruno

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c	Sat Mar 29 18:13:22 2014	(r263916)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c	Sat Mar 29 18:56:11 2014	(r263917)
@@ -669,6 +669,7 @@ ar9300_set_power_mode(struct ath_hal *ah
     
     switch (mode) {
     case HAL_PM_AWAKE:
+        ah->ah_powerMode = mode;
         status = ar9300_set_power_mode_awake(ah, set_chip);
 #if ATH_SUPPORT_MCI
         if (AH_PRIVATE(ah)->ah_caps.halMciSupport) {
@@ -699,6 +700,7 @@ ar9300_set_power_mode(struct ath_hal *ah
 #endif
         ar9300_set_power_mode_sleep(ah, set_chip);
         ahp->ah_chip_full_sleep = AH_TRUE;
+        ah->ah_powerMode = mode;
         break;
     case HAL_PM_NETWORK_SLEEP:
 #if ATH_SUPPORT_MCI
@@ -707,13 +709,13 @@ ar9300_set_power_mode(struct ath_hal *ah
         }
 #endif
         ar9300_set_power_mode_network_sleep(ah, set_chip);
+        ah->ah_powerMode = mode;
         break;
     default:
         HALDEBUG(ah, HAL_DEBUG_POWER_MGMT,
             "%s: unknown power mode %u\n", __func__, mode);
         return AH_FALSE;
     }
-    ah->ah_powerMode = status;
     return status;
 }