From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Jan 2014 19:08:41 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: accepted/tizen/common/20141203.182822~719^2~3^2^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d1cd503c7618d2eb00746fa1ebb06a723e108b4;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

9d1cd503c7618d2eb00746fa1ebb06a723e108b4
diff --cc drivers/net/wireless/ath/ath9k/ar9002_mac.c
index 857ede3,a366d6b..741b38d
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@@ -134,11 -154,23 +155,24 @@@ static bool ar9002_hw_get_isr(struct at
  		if ((s5_s & AR_ISR_S5_TIM_TIMER) &&
  		    !(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
  			*masked |= ATH9K_INT_TIM_TIMER;
+ 
+ 		if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
+ 			REG_WRITE(ah, AR_ISR_S5, s5_s);
+ 			isr &= ~AR_ISR_GENTMR;
+ 		}
  	}
  
+ 	if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
+ 		REG_WRITE(ah, AR_ISR, isr);
+ 		REG_READ(ah, AR_ISR);
+ 	}
+ 
+ 	if (AR_SREV_9100(ah))
+ 		return true;
+ 
  	if (sync_cause) {
 -		ath9k_debug_sync_cause(common, sync_cause);
 +		if (sync_cause_p)
 +			*sync_cause_p = sync_cause;
  		fatal_int =
  			(sync_cause &
  			 (AR_INTR_SYNC_HOST1_FATAL | AR_INTR_SYNC_HOST1_PERR))