diff options
| author | Pramod Gurav <pramod.gurav@smartplayin.com> | 2014-08-06 18:03:25 +0530 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2014-08-06 20:50:44 +0200 |
| commit | 3cf357dfb40b4a594a704f05b629cb5db97cc7fb (patch) | |
| tree | 222683da36b8fc8e69441b76b27fa9722f59683c /drivers/i2c | |
| parent | 741d3589e2213be4343529f57904521c6b846b10 (diff) | |
| download | op-kernel-dev-3cf357dfb40b4a594a704f05b629cb5db97cc7fb.zip op-kernel-dev-3cf357dfb40b4a594a704f05b629cb5db97cc7fb.tar.gz | |
i2c: qup: disable clks and return instead of just returning error
This fixes a error handling scenario where clocks were not being disabled
when QUP_OUTPUT_BLOCK_SIZE returns a size greater than the size of blk_sizes
array. So this patch adds a statement to jump to the fail lable to release the
clocks.
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Acked-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-qup.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 2a5efb5..3a4d64e 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -633,13 +633,17 @@ static int qup_i2c_probe(struct platform_device *pdev) * associated with each byte written/received */ size = QUP_OUTPUT_BLOCK_SIZE(io_mode); - if (size >= ARRAY_SIZE(blk_sizes)) - return -EIO; + if (size >= ARRAY_SIZE(blk_sizes)) { + ret = -EIO; + goto fail; + } qup->out_blk_sz = blk_sizes[size] / 2; size = QUP_INPUT_BLOCK_SIZE(io_mode); - if (size >= ARRAY_SIZE(blk_sizes)) - return -EIO; + if (size >= ARRAY_SIZE(blk_sizes)) { + ret = -EIO; + goto fail; + } qup->in_blk_sz = blk_sizes[size] / 2; size = QUP_OUTPUT_FIFO_SIZE(io_mode); |
