From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bL9fx-0003mN-DD for qemu-devel@nongnu.org; Thu, 07 Jul 2016 09:49:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bL9fv-0001tx-AI for qemu-devel@nongnu.org; Thu, 07 Jul 2016 09:49:08 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bL9fv-0001s4-2v for qemu-devel@nongnu.org; Thu, 07 Jul 2016 09:49:07 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bL9fn-0004Zz-BA for qemu-devel@nongnu.org; Thu, 07 Jul 2016 14:48:59 +0100 From: Peter Maydell Date: Thu, 7 Jul 2016 14:48:54 +0100 Message-Id: <1467899337-19192-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1467899337-19192-1-git-send-email-peter.maydell@linaro.org> References: <1467899337-19192-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 3/6] aux: fix break that wanted to break two levels out List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Paolo Bonzini The last "ret = AUX_I2C_NACK;" is dead, because it is always overridden by AUX_I2C_ACK. What really the code wants is to jump out of the switch statement, and a "return" will not cut it because it would omit a debug printf. Change the logic so that we can break out of the while loop. For clarity, hoist the bus->last_* assignments up, right after i2c_start_transfer. Signed-off-by: Paolo Bonzini Signed-off-by: Peter Maydell --- hw/misc/aux.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/misc/aux.c b/hw/misc/aux.c index 25d7712..06e24ca 100644 --- a/hw/misc/aux.c +++ b/hw/misc/aux.c @@ -153,12 +153,12 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address, case WRITE_I2C_MOT: case READ_I2C_MOT: is_write = cmd == READ_I2C_MOT ? false : true; + ret = AUX_I2C_NACK; if (!i2c_bus_busy(i2c_bus)) { /* * No transactions started.. */ if (i2c_start_transfer(i2c_bus, address, is_write)) { - ret = AUX_I2C_NACK; break; } } else if ((address != bus->last_i2c_address) || @@ -168,22 +168,22 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address, */ i2c_end_transfer(i2c_bus); if (i2c_start_transfer(i2c_bus, address, is_write)) { - ret = AUX_I2C_NACK; break; } } + bus->last_transaction = cmd; + bus->last_i2c_address = address; while (len > 0) { if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { - ret = AUX_I2C_NACK; i2c_end_transfer(i2c_bus); break; } len--; } - bus->last_transaction = cmd; - bus->last_i2c_address = address; - ret = AUX_I2C_ACK; + if (len == 0) { + ret = AUX_I2C_ACK; + } break; default: DPRINTF("Not implemented!\n"); -- 1.9.1