Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17...

[cascardo/linux.git] / drivers / leds / leds-adp5520.c

diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index 86b5bdb..5036d7b 100644 (file)
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -120,13 +120,10 @@ static int adp5520_led_probe(struct platform_device *pdev)
 
        led = devm_kzalloc(&pdev->dev, sizeof(*led) * pdata->num_leds,
                                GFP_KERNEL);
-       if (led == NULL) {
-               dev_err(&pdev->dev, "failed to alloc memory\n");
+       if (!led)
                return -ENOMEM;
-       }
 
        ret = adp5520_led_prepare(pdev);
-
        if (ret) {
                dev_err(&pdev->dev, "failed to write\n");
                return ret;