From 81fc861e49648500e656c754a0a9abead02c6b4f Mon Sep 17 00:00:00 2001 From: J Keerthy Date: Tue, 11 Sep 2012 19:06:52 +0300 Subject: [PATCH] --- yaml --- r: 325158 b: refs/heads/master c: 76d2cd30b5abf1dbca274d13d14260252b5898fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omap-thermal/omap-bandgap.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0e7327133713..a9d4e24408dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 559e9a6899cd3056764e4272681b64eb326df3f1 +refs/heads/master: 76d2cd30b5abf1dbca274d13d14260252b5898fb diff --git a/trunk/drivers/staging/omap-thermal/omap-bandgap.c b/trunk/drivers/staging/omap-thermal/omap-bandgap.c index c556abb63a17..9ef44eab468a 100644 --- a/trunk/drivers/staging/omap-thermal/omap-bandgap.c +++ b/trunk/drivers/staging/omap-thermal/omap-bandgap.c @@ -1037,20 +1037,20 @@ static int omap_bandgap_save_ctxt(struct omap_bandgap *bg_ptr) if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG)) rval->bg_mode_ctrl = omap_bandgap_readl(bg_ptr, - tsr->bgap_mode_ctrl); + tsr->bgap_mode_ctrl); if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER)) rval->bg_counter = omap_bandgap_readl(bg_ptr, - tsr->bgap_counter); + tsr->bgap_counter); if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) { rval->bg_threshold = omap_bandgap_readl(bg_ptr, - tsr->bgap_threshold); + tsr->bgap_threshold); rval->bg_ctrl = omap_bandgap_readl(bg_ptr, - tsr->bgap_mask_ctrl); + tsr->bgap_mask_ctrl); } if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG)) rval->tshut_threshold = omap_bandgap_readl(bg_ptr, - tsr->tshut_threshold); + tsr->tshut_threshold); } return 0; @@ -1074,8 +1074,9 @@ static int omap_bandgap_restore_ctxt(struct omap_bandgap *bg_ptr) if (val == 0) { if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG)) - omap_bandgap_writel(bg_ptr, rval->tshut_threshold, - tsr->tshut_threshold); + omap_bandgap_writel(bg_ptr, + rval->tshut_threshold, + tsr->tshut_threshold); /* Force immediate temperature measurement and update * of the DTEMP field */