Merge tag 'sound-fix-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / pwm / pwm-imx.c

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index cc477334487494fe014ba8993feb8c674fadad3f..d797c7b84c3feb4b23bd2c2d21651902eda6784f 100644 (file)
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -241,10 +241,8 @@ static int imx_pwm_probe(struct platform_device *pdev)
                return -ENODEV;
 
        imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
-       if (imx == NULL) {
-               dev_err(&pdev->dev, "failed to allocate memory\n");
+       if (imx == NULL)
                return -ENOMEM;
-       }
 
        imx->clk_per = devm_clk_get(&pdev->dev, "per");
        if (IS_ERR(imx->clk_per)) {