Browse Source

Merge branch 'for-4.7/pwm-cleanup' into for-next

Thierry Reding 9 years ago
parent
commit
c3499f0bc3
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/pwm/core.c

+ 2 - 1
drivers/pwm/core.c

@@ -75,6 +75,7 @@ static void free_pwms(struct pwm_chip *chip)
 
 
 	for (i = 0; i < chip->npwm; i++) {
 	for (i = 0; i < chip->npwm; i++) {
 		struct pwm_device *pwm = &chip->pwms[i];
 		struct pwm_device *pwm = &chip->pwms[i];
+
 		radix_tree_delete(&pwm_tree, pwm->pwm);
 		radix_tree_delete(&pwm_tree, pwm->pwm);
 	}
 	}
 
 
@@ -254,7 +255,7 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip,
 	if (ret < 0)
 	if (ret < 0)
 		goto out;
 		goto out;
 
 
-	chip->pwms = kzalloc(chip->npwm * sizeof(*pwm), GFP_KERNEL);
+	chip->pwms = kcalloc(chip->npwm, sizeof(*pwm), GFP_KERNEL);
 	if (!chip->pwms) {
 	if (!chip->pwms) {
 		ret = -ENOMEM;
 		ret = -ENOMEM;
 		goto out;
 		goto out;