Revert "i2c: only send 1 master stop in FORCE_UNLOCK reset mode"

This reverts commit 28bfab63a26982fe32b7711729ee79f58aaa623a.

Change-Id: I02060167fc113dcd81da59742e5cf5d6c8c5a766
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36573
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index d8cde876e..59dda817a 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -2724,14 +2724,13 @@ errlHndl_t i2cReset ( TARGETING::Target * i_target,
                 // So just commit the log here and let the function continue.
                 errlCommit( err, I2C_COMP_ID );
             }
-        } else {
-
-            // Part of doing the I2C Master reset is also sending a stop
-            // command to the slave device.
-            err = i2cSendSlaveStop( i_target,
-                                    i_args );
         }
 
+        // Part of doing the I2C Master reset is also sending a stop
+        // command to the slave device.
+        err = i2cSendSlaveStop( i_target,
+                                i_args );
+
         if( err )
         {
             break;