Merge remote-tracking branch 'asoc/topic/designware' into tmp

diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 70eb37a5dd16337614abd50462521706b6f7f9b3..25c31f1655f682f3e5c630c08c8b09fdfe2901cc 100644 (file)
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -421,13 +421,11 @@ static int dw_i2s_probe(struct platform_device *pdev)
                                         dw_i2s_dai, 1);
        if (ret != 0) {
                dev_err(&pdev->dev, "not able to register dai\n");
-               goto err_set_drvdata;
+               goto err_clk_disable;
        }
 
        return 0;
 
-err_set_drvdata:
-       dev_set_drvdata(&pdev->dev, NULL);
 err_clk_disable:
        clk_disable(dev->clk);
 err_clk_put:
@@ -440,7 +438,6 @@ static int dw_i2s_remove(struct platform_device *pdev)
        struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
 
        snd_soc_unregister_component(&pdev->dev);
-       dev_set_drvdata(&pdev->dev, NULL);
 
        clk_put(dev->clk);