summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-tegra.c8
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: