From 5473efbe62d5bb0d9885f5bc259ff0ceb8b818c8 Mon Sep 17 00:00:00 2001 From: Kalle Pokki Date: Sun, 27 Jan 2008 18:14:52 +0100 Subject: [PATCH] --- yaml --- r: 77355 b: refs/heads/master c: 991dee591a99d035796a8c194eb1796cc020e142 h: refs/heads/master i: 77353: 736a9f5d8327cb5f1d885171ae94eb47e13e2c8f 77351: b8a410b95d48f3200c1612b33f1c404c8498475d v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-bfin-twi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6fdfe7119909..c7193570cb79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b798c4d16b762d15f4055597ff8d87f73b35552 +refs/heads/master: 991dee591a99d035796a8c194eb1796cc020e142 diff --git a/trunk/drivers/i2c/busses/i2c-bfin-twi.c b/trunk/drivers/i2c/busses/i2c-bfin-twi.c index 67224a424aba..7dbdaeb707a9 100644 --- a/trunk/drivers/i2c/busses/i2c-bfin-twi.c +++ b/trunk/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