Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d8f640 authored by Vadim Pasternak's avatar Vadim Pasternak Committed by Greg Kroah-Hartman
Browse files

i2c: mlxcpld: Fix wrong initialization order in probe 



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: 313ce648 ("i2c: mlxcpld: Add support for extended transaction length for i2c-mlxcpld")
Signed-off-by: default avatarVadim Pasternak <vadimp@mellanox.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88ad86b8

drivers/i2c/busses/i2c-mlxcpld.c

+1 −1
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ static int mlxcpld_i2c_probe(struct platform_device *pdev) 
	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 platform_device *pdev) 
		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);