Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / mfd / twl4030-audio.c

diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index d2ab222..a31fba9 100644 (file)
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -261,10 +261,8 @@ static int twl4030_audio_probe(struct platform_device *pdev)
                ret = -ENODEV;
        }
 
-       if (ret) {
-               platform_set_drvdata(pdev, NULL);
+       if (ret)
                twl4030_audio_dev = NULL;
-       }
 
        return ret;
 }
@@ -272,7 +270,6 @@ static int twl4030_audio_probe(struct platform_device *pdev)
 static int twl4030_audio_remove(struct platform_device *pdev)
 {
        mfd_remove_devices(&pdev->dev);
-       platform_set_drvdata(pdev, NULL);
        twl4030_audio_dev = NULL;
 
        return 0;