diff options
Diffstat (limited to 'drivers/pwm/pwm-ab8500.c')
| -rw-r--r-- | drivers/pwm/pwm-ab8500.c | 7 | 
1 files changed, 2 insertions, 5 deletions
| diff --git a/drivers/pwm/pwm-ab8500.c b/drivers/pwm/pwm-ab8500.c index 4248d0418273..93af1bbf88ce 100644 --- a/drivers/pwm/pwm-ab8500.c +++ b/drivers/pwm/pwm-ab8500.c @@ -99,7 +99,7 @@ static int ab8500_pwm_probe(struct platform_device *pdev)  	 * Nothing to be done in probe, this is required to get the  	 * device which is required for ab8500 read and write  	 */ -	ab8500 = kzalloc(sizeof(*ab8500), GFP_KERNEL); +	ab8500 = devm_kzalloc(&pdev->dev, sizeof(*ab8500), GFP_KERNEL);  	if (ab8500 == NULL) {  		dev_err(&pdev->dev, "failed to allocate memory\n");  		return -ENOMEM; @@ -111,10 +111,8 @@ static int ab8500_pwm_probe(struct platform_device *pdev)  	ab8500->chip.npwm = 1;  	err = pwmchip_add(&ab8500->chip); -	if (err < 0) { -		kfree(ab8500); +	if (err < 0)  		return err; -	}  	dev_dbg(&pdev->dev, "pwm probe successful\n");  	platform_set_drvdata(pdev, ab8500); @@ -132,7 +130,6 @@ static int ab8500_pwm_remove(struct platform_device *pdev)  		return err;  	dev_dbg(&pdev->dev, "pwm driver removed\n"); -	kfree(ab8500);  	return 0;  } | 

