From: Thomas Cort <tcort@minix3.org>
Date: Sun, 15 Sep 2013 23:56:48 +0000 (-0400)
Subject: bmp085: remove duplicate code
X-Git-Tag: v3.3.0~798
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch11.html?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F825%2F3;p=minix.git

bmp085: remove duplicate code

A copy and paste error caused a few lines of code to be duplicated.
This patch removes the excess code.

Change-Id: I7313efb537e2a4102fb25ce05782e82ae0c84285
---

diff --git a/drivers/bmp085/bmp085.c b/drivers/bmp085/bmp085.c
index 40cd0aaba..776558071 100644
--- a/drivers/bmp085/bmp085.c
+++ b/drivers/bmp085/bmp085.c
@@ -515,14 +515,6 @@ measure(int32_t * temperature, int32_t * pressure)
 
 	log_debug(&log, "Triggering Temp Reading...\n");
 
-	/* trigger temperature reading */
-	r = reg_write(CTRL_REG, CMD_TRIG_T);
-	if (r != OK) {
-		log_warn(&log, "Failed to trigger temperature reading.\n");
-		return -1;
-	}
-	micro_delay(UDELAY_T);
-
 	/* trigger temperature reading */
 	r = reg_write(CTRL_REG, CMD_TRIG_T);
 	if (r != OK) {