From dc102afb391b552dd45766d5f034ed1ae22d3dbd Mon Sep 17 00:00:00 2001 From: Sujith Manoharan Date: Mon, 10 Dec 2012 07:22:36 +0530 Subject: [PATCH] --- yaml --- r: 342103 b: refs/heads/master c: d882d242e4bfb2016e611a5aab0112fcece7a8ac h: refs/heads/master i: 342101: 7e36f8883fabb153586d66ec70423155ba22823d 342099: 68454be2760f75254d41d4bc5ae2f460d0c5fc79 342095: 5338b3508404a6953dab35a824882b612b0f0c7a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2bc81ba30c1a..fd2086f4d60f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36d2943ba738a601e29cbd86fa6ab6ac838f3905 +refs/heads/master: d882d242e4bfb2016e611a5aab0112fcece7a8ac diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c index b28565e80785..fb3a87eeb678 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_paprd.c @@ -965,9 +965,13 @@ EXPORT_SYMBOL(ar9003_paprd_init_table); bool ar9003_paprd_is_done(struct ath_hw *ah) { int paprd_done, agc2_pwr; + paprd_done = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1, AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE); + if (AR_SREV_9485(ah)) + goto exit; + if (paprd_done == 0x1) { agc2_pwr = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1, AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR); @@ -983,7 +987,7 @@ bool ar9003_paprd_is_done(struct ath_hw *ah) if (agc2_pwr <= PAPRD_IDEAL_AGC2_PWR_RANGE) paprd_done = 0; } - +exit: return !!paprd_done; } EXPORT_SYMBOL(ar9003_paprd_is_done);