Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

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

diff --git a/drivers/pwm/pwm-tiecap.c b/drivers/pwm/pwm-tiecap.c
index 032092c7a6ae3d23705ca79d6d1e175b2a524768..74efbe7f20c3ab084939421dcafa40b108baee95 100644 (file)
--- a/drivers/pwm/pwm-tiecap.c
+++ b/drivers/pwm/pwm-tiecap.c
@@ -209,10 +209,8 @@ static int ecap_pwm_probe(struct platform_device *pdev)
        u16 status;
 
        pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
-       if (!pc) {
-               dev_err(&pdev->dev, "failed to allocate memory\n");
+       if (!pc)
                return -ENOMEM;
-       }
 
        clk = devm_clk_get(&pdev->dev, "fck");
        if (IS_ERR(clk)) {