Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus

[muen/linux.git] / sound / soc / rockchip / rockchip_i2s.c

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index a7972c2d4e7be61ef2aee303da56eebe61dfa158..908211e1d6fcb46eb8e0d7d8401a892967ba156a 100644 (file)
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -579,10 +579,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
        int val;
 
        i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
        int val;
 
        i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);

-       if (!i2s) {
-               dev_err(&pdev->dev, "Can't allocate rk_i2s_dev\n");
+       if (!i2s)

                return -ENOMEM;
                return -ENOMEM;

-       }

 
        i2s->dev = &pdev->dev;
 
 
        i2s->dev = &pdev->dev;