| From 13067ef73f337336e3149f5bb9f3fd05fe7f87a0 Mon Sep 17 00:00:00 2001 |
| From: Vadim Pasternak <vadimp@mellanox.com> |
| Date: Thu, 16 May 2019 17:15:41 +0000 |
| Subject: i2c: mlxcpld: Fix wrong initialization order in probe |
| |
| From: Vadim Pasternak <vadimp@mellanox.com> |
| |
| commit 13067ef73f337336e3149f5bb9f3fd05fe7f87a0 upstream. |
| |
| Fix wrong order in probing routine initialization - field `base_addr' |
| is used before it's initialized. Move assignment of 'priv->base_addr` |
| to the beginning, prior the call to mlxcpld_i2c_read_comm(). |
| Wrong order caused the first read of capability register to be executed |
| at wrong offset 0x0 instead of 0x2000. By chance it was a "good |
| garbage" at 0x0 offset. |
| |
| Fixes: 313ce648b5a4 ("i2c: mlxcpld: Add support for extended transaction length for i2c-mlxcpld") |
| Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| Cc: stable@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/i2c/busses/i2c-mlxcpld.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/i2c/busses/i2c-mlxcpld.c |
| +++ b/drivers/i2c/busses/i2c-mlxcpld.c |
| @@ -503,6 +503,7 @@ static int mlxcpld_i2c_probe(struct plat |
| platform_set_drvdata(pdev, priv); |
| |
| priv->dev = &pdev->dev; |
| + priv->base_addr = MLXPLAT_CPLD_LPC_I2C_BASE_ADDR; |
| |
| /* Register with i2c layer */ |
| mlxcpld_i2c_adapter.timeout = usecs_to_jiffies(MLXCPLD_I2C_XFER_TO); |
| @@ -518,7 +519,6 @@ static int mlxcpld_i2c_probe(struct plat |
| mlxcpld_i2c_adapter.nr = pdev->id; |
| priv->adap = mlxcpld_i2c_adapter; |
| priv->adap.dev.parent = &pdev->dev; |
| - priv->base_addr = MLXPLAT_CPLD_LPC_I2C_BASE_ADDR; |
| i2c_set_adapdata(&priv->adap, priv); |
| |
| err = i2c_add_numbered_adapter(&priv->adap); |