From: John W. Linville Date: Thu, 8 Apr 2010 20:34:49 +0000 (-0400) Subject: ath5k: fixup some merge damage for AR5211 IQ calibration X-Git-Tag: upstream/snapshot3+hdmi~14568^2~167^2~319 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ace5d5de6bbaff00d3b5dd7ea8f160b570fdb726;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ath5k: fixup some merge damage for AR5211 IQ calibration Resolution of a merge conflict upstream accidentally removed a hunk of "ath5k: IQ calibration for AR5211 is slightly different", so restore it. Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 4a49dbb..60873a4 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -1388,7 +1388,10 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah, i_coff = (-iq_corr) / i_coffd; i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */ - q_coff = (i_pwr / q_coffd) - 128; + if (ah->ah_version == AR5K_AR5211) + q_coff = (i_pwr / q_coffd) - 64; + else + q_coff = (i_pwr / q_coffd) - 128; q_coff = clamp(q_coff, -16, 15); /* signed 5 bit */ ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_CALIBRATE,