i2c: bcm2835: Move IRQ request after clock code in probe

If any of the clock code in the probe fails and returns, the IRQ
will not be freed.  Moving the IRQ request to last allows it to
be freed on any errors further up in the probe function.  devm_
calls can apparently not be used because there are some potential
race conditions that will arise.

Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
Acked-by: Stefan Wahren <wahrenst@gmx.net>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 5b55627..512c638 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -416,20 +416,6 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
        if (IS_ERR(i2c_dev->regs))
                return PTR_ERR(i2c_dev->regs);
 
-       irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!irq) {
-               dev_err(&pdev->dev, "No IRQ resource\n");
-               return -ENODEV;
-       }
-       i2c_dev->irq = irq->start;
-
-       ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
-                         dev_name(&pdev->dev), i2c_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "Could not request IRQ\n");
-               return -ENODEV;
-       }
-
        mclk_name = of_clk_get_parent_name(pdev->dev.of_node, 0);
 
        bus_clk = bcm2835_i2c_register_div(&pdev->dev, mclk_name, i2c_dev);
@@ -459,6 +445,20 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
                return ret;
        }
 
+       irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       if (!irq) {
+               dev_err(&pdev->dev, "No IRQ resource\n");
+               return -ENODEV;
+       }
+       i2c_dev->irq = irq->start;
+
+       ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
+                         dev_name(&pdev->dev), i2c_dev);
+       if (ret) {
+               dev_err(&pdev->dev, "Could not request IRQ\n");
+               return -ENODEV;
+       }
+
        adap = &i2c_dev->adapter;
        i2c_set_adapdata(adap, i2c_dev);
        adap->owner = THIS_MODULE;