From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFLXa-00059w-85 for qemu-devel@nongnu.org; Tue, 21 Jun 2016 09:16:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFLXS-0001zF-4S for qemu-devel@nongnu.org; Tue, 21 Jun 2016 09:16:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFLXR-0001z9-VH for qemu-devel@nongnu.org; Tue, 21 Jun 2016 09:16:22 -0400 From: Paolo Bonzini Date: Tue, 21 Jun 2016 15:16:17 +0200 Message-Id: <1466514977-12670-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1466514977-12670-1-git-send-email-pbonzini@redhat.com> References: <1466514977-12670-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] 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 Cc: peter.maydell@linaro.org, fred.konrad@greensocs.com 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 --- 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"); -- 2.5.5