From: Kalle Pokki Date: Sun, 27 Jan 2008 17:14:52 +0000 (+0100) Subject: i2c-bfin-twi: Register adapter with a specific bus number X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=991dee591a99d035796a8c194eb1796cc020e142;p=linux-beck.git i2c-bfin-twi: Register adapter with a specific bus number All the users of this driver explicitly specify the I2C bus numbers to be used in their platform data. Make the driver respect that. Signed-off-by: Kalle Pokki Cc: Bryan Wu Signed-off-by: Jean Delvare --- diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c index 67224a424aba..7dbdaeb707a9 100644 --- a/drivers/i2c/busses/i2c-bfin-twi.c +++ b/drivers/i2c/busses/i2c-bfin-twi.c @@ -550,6 +550,7 @@ static int i2c_bfin_twi_probe(struct platform_device *dev) p_adap = &iface->adap; p_adap->id = I2C_HW_BLACKFIN; + p_adap->nr = dev->id; strlcpy(p_adap->name, dev->name, sizeof(p_adap->name)); p_adap->algo = &bfin_twi_algorithm; p_adap->algo_data = iface; @@ -576,7 +577,7 @@ static int i2c_bfin_twi_probe(struct platform_device *dev) bfin_write_TWI_CONTROL(bfin_read_TWI_CONTROL() | TWI_ENA); SSYNC(); - rc = i2c_add_adapter(p_adap); + rc = i2c_add_numbered_adapter(p_adap); if (rc < 0) free_irq(iface->irq, iface); else