diff options
| author | Ben Dooks <ben.dooks@codethink.co.uk> | 2015-03-23 12:01:35 +0000 |
|---|---|---|
| committer | Ben Dooks <ben.dooks@codethink.co.uk> | 2015-03-23 12:01:35 +0000 |
| commit | 51634c3125eba45b4daea034bbc2f1a173379ff1 (patch) | |
| tree | de3d0b63aab77c349c3bacd1517806efb40504e3 | |
| parent | cbaffea9419d92b04c879d5400d8fae3430a5e82 (diff) | |
| download | linux-baserock/bjdooks/i2c-tegra-fix1.tar.gz | |
fixup my i2c changesbaserock/bjdooks/i2c-tegra-fix1
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index e5d05f5719a2..419c488f1676 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -215,11 +215,11 @@ static u32 i2c_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg) static void i2c_writesl(struct tegra_i2c_dev *i2c_dev, void *data, unsigned long reg, int len) { - void __iomem *reg = i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg); + void __iomem *reg2 = i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg); uint32_t *dp = (uint32_t *)data; while (len) { - writel(*dp, reg); + writel(*dp, reg2); dp++; len--; } @@ -228,11 +228,11 @@ static void i2c_writesl(struct tegra_i2c_dev *i2c_dev, void *data, static void i2c_readsl(struct tegra_i2c_dev *i2c_dev, void *data, unsigned long reg, int len) { - void __iomem *reg = i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg); + void __iomem *reg2 = i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg); uint32_t *dp = (uint32_t *)data; while (len) { - *dp = readl(reg); + *dp = readl(reg2); len--; dp++; } |