diff options
| author | Simon Glass <sjg@chromium.org> | 2014-10-01 19:57:24 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-10-22 10:36:55 -0600 |
| commit | edbf8b4f8c7ef61d3dea5f629e0d756990b8277d (patch) | |
| tree | 71cb5e5d6d2617f8e841d8e560b5d685d756a2e9 /arch/arm/imx-common | |
| parent | b8893327e9d22ded1cd70669884ed9d53fa9b013 (diff) | |
| download | talos-obmc-uboot-edbf8b4f8c7ef61d3dea5f629e0d756990b8277d.tar.gz talos-obmc-uboot-edbf8b4f8c7ef61d3dea5f629e0d756990b8277d.zip | |
imx: Add error checking to setup_i2c()
Since this function can fail, check its return value.
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/i2c-mxv7.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/arch/arm/imx-common/i2c-mxv7.c b/arch/arm/imx-common/i2c-mxv7.c index a58087399c..70cff5cc8d 100644 --- a/arch/arm/imx-common/i2c-mxv7.c +++ b/arch/arm/imx-common/i2c-mxv7.c @@ -69,15 +69,29 @@ static void * const i2c_bases[] = { }; /* i2c_index can be from 0 - 2 */ -void setup_i2c(unsigned i2c_index, int speed, int slave_addr, - struct i2c_pads_info *p) +int setup_i2c(unsigned i2c_index, int speed, int slave_addr, + struct i2c_pads_info *p) { + int ret; + if (i2c_index >= ARRAY_SIZE(i2c_bases)) - return; + return -EINVAL; /* Enable i2c clock */ - enable_i2c_clk(1, i2c_index); + ret = enable_i2c_clk(1, i2c_index); + if (ret) + goto err_clk; + /* Make sure bus is idle */ - force_idle_bus(p); + ret = force_idle_bus(p); + if (ret) + goto err_idle; + bus_i2c_init(i2c_bases[i2c_index], speed, slave_addr, force_idle_bus, p); + + return 0; + +err_idle: +err_clk: + return ret; } |
