commit 69b31fb402f3a630ab249ab374224767156188c9
author Andrew de los Reyes <adlr@google.com> Tue Sep 08 13:34:11 2015 -0700
committer Andrew Duggan <aduggan@synaptics.com> Thu Sep 10 11:16:24 2015 -0700
tree 8de34e8cdfcd265bcc981f91d942065dd51b134c
parent 6f1ac59f0d19cfe5a47a4388d845974764d9c547

rmi4update: massively speed up update when no update needed

rmi4update/rmi4update.cpp

diff --git a/rmi4update/rmi4update.cpp b/rmi4update/rmi4update.cpp
index 92d6518..91b5697 100644
--- a/rmi4update/rmi4update.cpp
+++ b/rmi4update/rmi4update.cpp
@@ -100,6 +100,15 @@
 	if (rc < 0)
 		return UPDATE_FAIL_QUERY_BASIC_PROPERTIES;
 
+	if (!force && m_firmwareImage.HasIO()) {
+		if (m_firmwareImage.GetFirmwareID() <= m_device.GetFirmwareID()) {
+			fprintf(stderr, "Firmware image (%ld) is not newer then the firmware on the device (%ld)\n",
+				m_firmwareImage.GetFirmwareID(), m_device.GetFirmwareID());
+			rc = UPDATE_FAIL_FIRMWARE_IMAGE_IS_OLDER;
+			return rc;
+		}
+	}
+
 	fprintf(stdout, "Device Properties:\n");
 	m_device.PrintProperties();
 
@@ -121,15 +130,6 @@
 		goto reset;
 	}
 
-	if (!force && m_firmwareImage.HasIO()) {
-		if (m_firmwareImage.GetFirmwareID() <= m_device.GetFirmwareID()) {
-			fprintf(stderr, "Firmware image (%ld) is not newer then the firmware on the device (%ld)\n",
-				m_firmwareImage.GetFirmwareID(), m_device.GetFirmwareID());
-			rc = UPDATE_FAIL_FIRMWARE_IMAGE_IS_OLDER;
-			goto reset;
-		}
-	}
-
 	if (performLockdown && m_unlocked) {
 		if (m_firmwareImage.GetLockdownData()) {
 			fprintf(stdout, "Writing lockdown...\n");