diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /drivers/i2c | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'drivers/i2c')
| -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 15ad0be8df06..2cbee05c3897 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -829,8 +829,8 @@ static int tegra_i2c_probe(struct platform_device *pdev) i2c_dev->is_clkon_always = plat->is_clkon_always; i2c_dev->last_bus_clk_rate = 100000; /* default clock rate */ - if (pdata) { - i2c_dev->last_bus_clk_rate = pdata->bus_clk_rate[0]; + if (plat) { + i2c_dev->last_bus_clk_rate = plat->bus_clk_rate[0]; } else if (i2c_dev->dev->of_node) { /* if there is a device tree node ... */ /* TODO: DAN: this doesn't work for DT */ @@ -906,11 +906,11 @@ static int tegra_i2c_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Failed to add I2C adapter\n"); goto err_del_bus; } + of_i2c_register_devices(&i2c_bus->adapter); + i2c_dev->bus_count++; } - of_i2c_register_devices(&i2c_dev->adapter); - return 0; err_del_bus: |