ext4: fix lost truncate due to race with writeback

[~andy/linux] / drivers / mfd / twl4030-madc.c

diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 42bd3ea5df3c3f07207b44bf6360fde54fb23b7f..1ea54d4d003aeb84c87c7af509dc13052a4bfc3f 100644 (file)
--- a/drivers/mfd/twl4030-madc.c
+++ b/drivers/mfd/twl4030-madc.c
@@ -775,12 +775,10 @@ static int twl4030_madc_probe(struct platform_device *pdev)
                                   IRQF_TRIGGER_RISING, "twl4030_madc", madc);
        if (ret) {
                dev_dbg(&pdev->dev, "could not request irq\n");
-               goto err_irq;
+               goto err_i2c;
        }
        twl4030_madc = madc;
        return 0;
-err_irq:
-       platform_set_drvdata(pdev, NULL);
 err_i2c:
        twl4030_madc_set_current_generator(madc, 0, 0);
 err_current_generator:
@@ -796,7 +794,6 @@ static int twl4030_madc_remove(struct platform_device *pdev)
        struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
 
        free_irq(platform_get_irq(pdev, 0), madc);
-       platform_set_drvdata(pdev, NULL);
        twl4030_madc_set_current_generator(madc, 0, 0);
        twl4030_madc_set_power(madc, 0);
        kfree(madc);