diff options
| author | Alexander Graf <agraf@suse.de> | 2013-08-29 02:41:59 +0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-29 02:41:59 +0400 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /drivers/mfd/twl4030-madc.c | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc (diff) | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 (diff) | |
| download | linux-bf550fc93d9855872a95e69e4002256110d89858.tar.xz | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'drivers/mfd/twl4030-madc.c')
| -rw-r--r-- | drivers/mfd/twl4030-madc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c index 42bd3ea5df3c..1ea54d4d003a 100644 --- 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); |