From 4a9fce1952b2b4742bd07bc5137c75b0225d56ab Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 28 Mar 2019 15:30:18 +0100
Subject: all: fix warnings pointed to by golangci-lint

Update #977
---
 vm/adb/adb.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'vm/adb')

diff --git a/vm/adb/adb.go b/vm/adb/adb.go
index 433caf16d..3996ab012 100644
--- a/vm/adb/adb.go
+++ b/vm/adb/adb.go
@@ -328,12 +328,11 @@ func (inst *instance) getBatteryLevel(numRetry int) (int, error) {
 			// sleep for 5 seconds before retrying
 			time.Sleep(5 * time.Second)
 			out, err = inst.adb("shell", "dumpsys battery | grep level:")
-		} else {
-			if err != nil {
-				return 0, err
-			}
 		}
 	}
+	if err != nil {
+		return 0, err
+	}
 	val := 0
 	for _, c := range out {
 		if c >= '0' && c <= '9' {
-- 
cgit mrf-deployment