nak_ok = pmsg->flags & I2C_M_IGNORE_NAK;
                if (!(pmsg->flags & I2C_M_NOSTART)) {
                        if (i) {
-                               bit_dbg(3, &i2c_adap->dev, "emitting "
-                                       "repeated start condition\n");
-                               i2c_repstart(adap);
+                               if (msgs[i - 1].flags & I2C_M_STOP) {
+                                       bit_dbg(3, &i2c_adap->dev,
+                                               "emitting enforced stop/start condition\n");
+                                       i2c_stop(adap);
+                                       i2c_start(adap);
+                               } else {
+                                       bit_dbg(3, &i2c_adap->dev,
+                                               "emitting repeated start condition\n");
+                                       i2c_repstart(adap);
+                               }
                        }
                        ret = bit_doAddress(i2c_adap, pmsg);
                        if ((ret != 0) && !nak_ok) {