From b2a1ea67cfa8f7488ce8565af45f16a85cf7767c Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Tue, 19 Mar 2013 10:54:27 -0400 Subject: [PATCH] --- yaml --- r: 363681 b: refs/heads/master c: 0fb3c244fe506d1c0e6138890685c1d5e8cd29e2 h: refs/heads/master i: 363679: 54666737cb735f6d5e92e2f8a1dee0b4bc81aaa2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ti-soc-thermal/ti-bandgap.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 160e4f17a734..e97afd30ff2a 100644 --- 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 index d0751863a9c0..5c946cd7d672 100644 --- 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) {