Merge remote-tracking branch 'pwm/for-next'

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

diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c
index cb2d4f0f97114b30cfa04cf29daf13dccf8cc3a7..2daf3a1cc8eed5cdb84afed45b6a5a07d62b5fa2 100644 (file)
--- a/drivers/pwm/pwm-spear.c
+++ b/drivers/pwm/pwm-spear.c
@@ -179,10 +179,8 @@ static int spear_pwm_probe(struct platform_device *pdev)
        u32 val;
 
        pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
-       if (!pc) {
-               dev_err(&pdev->dev, "failed to allocate memory\n");
+       if (!pc)
                return -ENOMEM;
-       }
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        pc->mmio_base = devm_ioremap_resource(&pdev->dev, r);