---

yaml --- r: 363681 b: refs/heads/master c: 0fb3c24 h: refs/heads/master i: 363679: 5466673 v: v3
git-mirror · Mar 25, 2013 · b2a1ea6 · b2a1ea6
1 parent 2de6f60
commit b2a1ea6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5d43b7a51af16977b260c05435d61fc653f584a
+refs/heads/master: 0fb3c244fe506d1c0e6138890685c1d5e8cd29e2
diff --git a/trunk/drivers/staging/ti-soc-thermal/ti-bandgap.c b/trunk/drivers/staging/ti-soc-thermal/ti-bandgap.c
@@ -418,10 +418,10 @@ static int ti_bandgap_update_alert_threshold(struct ti_bandgap *bgp, int id,
 	}
 
 	/* write the new threshold values */
-	reg_val = thresh_val & ~tsr->threshold_thot_mask;
-	reg_val |= (t_hot << __ffs(tsr->threshold_thot_mask));
-	reg_val |= thresh_val & ~tsr->threshold_tcold_mask;
-	reg_val |= (t_cold << __ffs(tsr->threshold_tcold_mask));
+	reg_val = thresh_val &
+		  ~(tsr->threshold_thot_mask | tsr->threshold_tcold_mask);
+	reg_val |= (t_hot << __ffs(tsr->threshold_thot_mask)) |
+		   (t_cold << __ffs(tsr->threshold_tcold_mask));
 	ti_bandgap_writel(bgp, reg_val, tsr->bgap_threshold);
 
 	if (err) {