ath9k: merge a few reset / calibration fixes