Skip to contentSkip to conversation

leds: leds-sunfire: fix sunfire_led_generic_probe error handling

PATCH New Axel Lin 1 participant 1 message Jun 28, 2011 LED

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 leds: leds-sunfire: fix sunfire_led_generic_probe error handling

This patch includes below fixes:
1. Return -ENOMEM if kzalloc fails
2. Fix a memory leak in the case of goto out_unregister_led_cdevs.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/leds/leds-sunfire.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
drivers/leds/leds-sunfire.c +7 -5
index ab6d18f..1757396 100644
@@ -127,17 +127,19 @@ static int __devinit sunfire_led_generic_probe(struct platform_device *pdev,
 					       struct led_type *types)
 {
 	struct sunfire_drvdata *p;
-	int i, err = -EINVAL;
+	int i, err;
 
 	if (pdev->num_resources != 1) {
 		printk(KERN_ERR PFX "Wrong number of resources %d, should be 1\n",
 		       pdev->num_resources);
+		err = -EINVAL;
 		goto out;
 	}
 
 	p = kzalloc(sizeof(*p), GFP_KERNEL);
 	if (!p) {
 		printk(KERN_ERR PFX "Could not allocate struct sunfire_drvdata\n");
+		err = -ENOMEM;
 		goto out;
 	}
 

@@ -160,14 +162,14 @@ static int __devinit sunfire_led_generic_probe(struct platform_device *pdev,
 
 	dev_set_drvdata(&pdev->dev, p);
 
-	err = 0;
-out:
-	return err;
+	return 0;
 
 out_unregister_led_cdevs:
 	for (i--; i >= 0; i--)
 		led_classdev_unregister(&p->leds[i].led_cdev);
-	goto out;
+	kfree(p);
+out:
+	return err;
 }
 
 static int __devexit sunfire_led_generic_remove(struct platform_device *pdev)
Signature · 1 line
1.7.4.1