summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinqiang Pu <dpu@nvidia.com>2011-10-17 17:01:31 +0800
committerVarun Wadekar <vwadekar@nvidia.com>2012-01-04 11:45:44 +0530
commitd8eab4e2cccc3a48444f1c6bcba04440c99233ca (patch)
treeeff56c07ae29231cb602dad9fc1199c24052d43f
parent11d18187ac92974548268a8a92fee1272298600e (diff)
i2c: tegra:don't overwrite arb_recovery function pointer
put busses array as last struct member to avoid overwritting arb_recovery function pointer. Bug:889581 Reviewed-on: http://git-master/r/58347 (cherry picked from commit 223b2794fb0d3e94ccfb28549b74941a492415dd) Change-Id: I4e8792a0cb42255724c8e45baea4f273181a8e2f Signed-off-by: Linqiang Pu <dpu@nvidia.com> Reviewed-on: http://git-master/r/58942 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
-rw-r--r--drivers/i2c/busses/i2c-tegra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 2cbee05c3897..d28cd4e9d3d0 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -176,8 +176,8 @@ struct tegra_i2c_dev {
unsigned long last_bus_clk_rate;
u16 slave_addr;
bool is_clkon_always;
- struct tegra_i2c_bus busses[1];
int (*arb_recovery)(int scl_gpio, int sda_gpio);
+ struct tegra_i2c_bus busses[1];
};
static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val, unsigned long reg)