[PATCH v2] i2c: i801: Fix using mux_pdev before it's set

[PATCH v2] i2c: i801: Fix using mux_pdev before it's set

[Heiner Kallweit]

i801_probe_optional_slaves() is called before i801_add_mux().
This results in mux_pdev being checked before it's set by
i801_add_mux(). Fix this by changing the order of the calls.
I consider this safe as I see no dependencies.

Fixes: 80e56b86b59e ("i2c: i801: Simplify class-based client device instantiation")
Cc: stable@vger.kernel.org
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
v2:
- cc stable
---
 drivers/i2c/busses/i2c-i801.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 223cd2b84..8e95db95c 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1762,9 +1762,9 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
 	i801_enable_host_notify(&priv->adapter);
 
-	i801_probe_optional_slaves(priv);
 	/* We ignore errors - multiplexing is optional */
 	i801_add_mux(priv);
+	i801_probe_optional_slaves(priv);
 
 	pci_set_drvdata(dev, priv);
 
-- 
2.43.2

Re: [PATCH v2] i2c: i801: Fix using mux_pdev before it's set

[Andi Shyti]

Hi Heiner,

On Sun, Mar 03, 2024 at 11:45:22AM +0100, Heiner Kallweit wrote:
> i801_probe_optional_slaves() is called before i801_add_mux().
> This results in mux_pdev being checked before it's set by
> i801_add_mux(). Fix this by changing the order of the calls.
> I consider this safe as I see no dependencies.
> 
> Fixes: 80e56b86b59e ("i2c: i801: Simplify class-based client device instantiation")
> Cc: stable@vger.kernel.org
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Reviewed-by: Andi Shyti <andi.shyti@kernel.org>

Thanks,
Andi

Re: [PATCH v2] i2c: i801: Fix using mux_pdev before it's set

[Andi Shyti]

Hi

On Sun, 03 Mar 2024 11:45:22 +0100, Heiner Kallweit wrote:
> i801_probe_optional_slaves() is called before i801_add_mux().
> This results in mux_pdev being checked before it's set by
> i801_add_mux(). Fix this by changing the order of the calls.
> I consider this safe as I see no dependencies.
> 
> 

Applied to i2c/i2c-host-fixes on

git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git

Thank you,
Andi

Patches applied
===============
[1/1] i2c: i801: Fix using mux_pdev before it's set
      commit: b60b86b55400413e5f2f1c076f5a2f535341c9ce