From 95eaac687681debfdc7e2fc19f5ce6dc7f2ebfee Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 16 Jun 2017 11:48:57 -0400
Subject: [PATCH] bmp280 properly cleanup if failed

---
 src/drivers/bmp280/bmp280.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/drivers/bmp280/bmp280.cpp b/src/drivers/bmp280/bmp280.cpp
index e3ddc1aae5..9674ffca92 100644
--- a/src/drivers/bmp280/bmp280.cpp
+++ b/src/drivers/bmp280/bmp280.cpp
@@ -669,9 +669,13 @@ start_bus(struct bmp280_bus_option &bus)
 
 	bus.dev = new BMP280(interface, bus.devpath);
 
-	if (bus.dev != nullptr && OK != bus.dev->init()) {
+	if (bus.dev == nullptr) {
+		return false;
+	}
+
+	if (OK != bus.dev->init()) {
 		delete bus.dev;
-		bus.dev = NULL;
+		bus.dev = nullptr;
 		return false;
 	}