staging: ti-soc-thermal: fix bitfield writing while updating thresholds

Wrong threshold cold values may be written with current implementation.
This patch fixes the threshold update function by simplifying the
bitfield manipulation sequence.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eduardo Valentin 2013-03-19 10:54:27 -04:00 committed by Greg Kroah-Hartman
parent f5d43b7a51
commit 0fb3c244fe

View File

@ -418,10 +418,10 @@ static int ti_bandgap_update_alert_threshold(struct ti_bandgap *bgp, int id,
} }
/* write the new threshold values */ /* write the new threshold values */
reg_val = thresh_val & ~tsr->threshold_thot_mask; reg_val = thresh_val &
reg_val |= (t_hot << __ffs(tsr->threshold_thot_mask)); ~(tsr->threshold_thot_mask | tsr->threshold_tcold_mask);
reg_val |= thresh_val & ~tsr->threshold_tcold_mask; reg_val |= (t_hot << __ffs(tsr->threshold_thot_mask)) |
reg_val |= (t_cold << __ffs(tsr->threshold_tcold_mask)); (t_cold << __ffs(tsr->threshold_tcold_mask));
ti_bandgap_writel(bgp, reg_val, tsr->bgap_threshold); ti_bandgap_writel(bgp, reg_val, tsr->bgap_threshold);
if (err) { if (err) {