commit b3a219883ebe21f55a8ee5e7e5b38b9eb309e9c0
author Juha Riihimäki <Juha.Riihimaki@nokia.com> Mon Jun 08 09:27:19 2009 +0300
committer Aurelien Jarno <aurelien@aurel32.net> Wed Dec 02 17:26:19 2009 +0100
tree 56e6cc32df8b21b1d8e48a8b0fdeb354280a66bd
parent 51954d565fc5566897f6a6d90feb62e4944cebc5

fix I2C slave addressing

With the recent device handling changes the I2C slave addressing code
was broken. With current code, if a slave with the correct address is

not found on the bus the last scanned slave on the bus will be
addressed. This is wrong. Please find attached a patch to fix it.

Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>
Acked-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

hw/i2c.c

diff --git a/hw/i2c.c b/hw/i2c.c
index 5c291ce..bee8e88 100644
--- a/hw/i2c.c
+++ b/hw/i2c.c
@@ -85,9 +85,11 @@
     i2c_slave *slave = NULL;
 
     QLIST_FOREACH(qdev, &bus->qbus.children, sibling) {
-        slave = I2C_SLAVE_FROM_QDEV(qdev);
-        if (slave->address == address)
+        i2c_slave *candidate = I2C_SLAVE_FROM_QDEV(qdev);
+        if (candidate->address == address) {
+            slave = candidate;
             break;
+        }
     }
 
     if (!slave)