2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index f35156c58922..9c8b6d5eaec9 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/delay.h>
@@ -226,13 +227,14 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev)
         adapter->algo = &at91_algorithm;
         adapter->class = I2C_CLASS_HWMON;
         adapter->dev.parent = &pdev->dev;
+        /* adapter->id == 0 ... only one TWI controller for now */
 
         platform_set_drvdata(pdev, adapter);
 
         clk_enable(twi_clk);            /* enable peripheral clock */
         at91_twi_hwinit();              /* initialize TWI controller */
 
-        rc = i2c_add_adapter(adapter);
+        rc = i2c_add_numbered_adapter(adapter);
         if (rc) {
                 dev_err(&pdev->dev, "Adapter %s registration failed\n",
                                 adapter->name);
@@ -295,6 +297,9 @@ static int at91_i2c_resume(struct platform_device *pdev)
 #define at91_i2c_resume         NULL
 #endif
 
+/* work with "modprobe at91_i2c" from hotplugging or coldplugging */
+MODULE_ALIAS("at91_i2c");
+
 static struct platform_driver at91_i2c_driver = {
         .probe          = at91_i2c_probe,
         .remove         = __devexit_p(at91_i2c_remove),
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 873544ab598e..8a0a99b93641 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -548,7 +548,7 @@ static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c)
          */
         icr = readl(_ICR(i2c));
         icr &= ~(ICR_STOP | ICR_ACKNAK);
-        writel(icr, _IRC(i2c));
+        writel(icr, _ICR(i2c));
 }
 
 /*