[PATCH] i2c: Race fix for i2c-mpc.c

i2c: Race fix for i2c-mpc.c

The problem was that the clock speed and driver data is
initialized after the i2c adapter was added. This caused
the i2c bus to start working at a wrong speed. (Mostly
noticable on the second bus on mpc5200)

With this patch we've tried to keep the i2c adapter
working perfectly all the time it is included in the system.
Initialize before added, Remove garbage after deleleted.

Submitted-by: Asier Llano Palacios
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index c8a8703dcbcb16fdd5ccd5fddf8f322d2509d5dd..d41ca31dbcb2357cf4a37c2028aefae144c966be 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -333,6 +333,9 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
        } else
                i2c->irq = 0;
 
+       mpc_i2c_setclock(i2c);
+       ocp_set_drvdata(ocp, i2c);
+
        i2c->adap = mpc_ops;
        i2c_set_adapdata(&i2c->adap, i2c);
 
@@ -341,8 +344,6 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
                goto fail_add;
        }
 
-       mpc_i2c_setclock(i2c);
-       ocp_set_drvdata(ocp, i2c);
        return result;
 
       fail_add:
@@ -358,8 +359,8 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
 static void __devexit mpc_i2c_remove(struct ocp_device *ocp)
 {
        struct mpc_i2c *i2c = ocp_get_drvdata(ocp);
-       ocp_set_drvdata(ocp, NULL);
        i2c_del_adapter(&i2c->adap);
+       ocp_set_drvdata(ocp, NULL);
 
        if (ocp->def->irq != OCP_IRQ_NA)
                free_irq(i2c->irq, i2c);
@@ -430,6 +431,9 @@ static int fsl_i2c_probe(struct device *device)
                        goto fail_irq;
                }
 
+       mpc_i2c_setclock(i2c);
+       dev_set_drvdata(device, i2c);
+
        i2c->adap = mpc_ops;
        i2c_set_adapdata(&i2c->adap, i2c);
        i2c->adap.dev.parent = &pdev->dev;
@@ -438,8 +442,6 @@ static int fsl_i2c_probe(struct device *device)
                goto fail_add;
        }
 
-       mpc_i2c_setclock(i2c);
-       dev_set_drvdata(device, i2c);
        return result;
 
       fail_add:
@@ -456,8 +458,8 @@ static int fsl_i2c_remove(struct device *device)
 {
        struct mpc_i2c *i2c = dev_get_drvdata(device);
 
-       dev_set_drvdata(device, NULL);
        i2c_del_adapter(&i2c->adap);
+       dev_set_drvdata(device, NULL);
 
        if (i2c->irq != 0)
                free_irq(i2c->irq, i2c);