diff --git a/[refs] b/[refs]
index ea8d870febec..d0ff666b7baf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb007554fe1f66c4796c7c7ae7bfc735fc8213f7
+refs/heads/master: c9e57f0fdccf74ef7884fed61d212e524b9c4bcd
diff --git a/trunk/drivers/net/wireless/ath/carl9170/phy.c b/trunk/drivers/net/wireless/ath/carl9170/phy.c
index 82bc81c4c930..122e75ee8eff 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/phy.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/phy.c
@@ -1676,6 +1676,8 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
 
 	err = carl9170_write_reg(ar, AR9170_PHY_REG_HEAVY_CLIP_ENABLE,
 				 0x200);
+	if (err)
+		return err;
 
 	err = carl9170_init_rf_bank4_pwr(ar,
 		channel->band == IEEE80211_BAND_5GHZ,