]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
i2c: i801: Fix using mux_pdev before it's set
authorHeiner Kallweit <hkallweit1@gmail.com>
Sun, 3 Mar 2024 10:45:22 +0000 (11:45 +0100)
committerWolfram Sang <wsa+renesas@sang-engineering.com>
Fri, 8 Mar 2024 09:10:26 +0000 (10:10 +0100)
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>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-i801.c

index 2c36b36d7d516c851c8e9e44c8f90ce11fac0f13..9a0a77383ca85c24804eda5cfa155cb2d92c5ec1 100644 (file)
@@ -1742,9 +1742,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);