]> Zhao Yanbai Git Server - minix.git/commitdiff
bmp085: remove duplicate code 25/825/3
authorThomas Cort <tcort@minix3.org>
Sun, 15 Sep 2013 23:56:48 +0000 (19:56 -0400)
committerThomas Cort <tcort@minix3.org>
Wed, 18 Sep 2013 12:10:26 +0000 (08:10 -0400)
A copy and paste error caused a few lines of code to be duplicated.
This patch removes the excess code.

Change-Id: I7313efb537e2a4102fb25ce05782e82ae0c84285

drivers/bmp085/bmp085.c

index 40cd0aaba5fbc900fd2eee115f558dcb1490c6dd..7765580719529422d04636c4b31702d14a8f4df3 100644 (file)
@@ -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) {