Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / omap-thermal / omap-bandgap.c

diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/omap-thermal/omap-bandgap.c
index 21fd91bf97b59f2fa7253261853221b96ea9f866..dcc1448dbf8e8b2f7d74ab3d4a4735c8878a246c 100644 (file)
--- a/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/drivers/staging/omap-thermal/omap-bandgap.c
@@ -568,8 +568,6 @@ int omap_bandgap_read_update_interval(struct omap_bandgap *bg_ptr, int id,
 
        tsr = bg_ptr->conf->sensors[id].registers;
        time = omap_bandgap_readl(bg_ptr, tsr->bgap_counter);
-       if (ret)
-               return ret;
        time = (time & tsr->counter_mask) >> __ffs(tsr->counter_mask);
        time = time * 1000 / bg_ptr->clk_rate;