Merge branch 'for-4.7/pwm-cleanup' into for-next (c3499f0b) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/pwm/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ static void free_pwms(struct pwm_chip *chip)

		for (i = 0; i < chip->npwm; i++) {
		struct pwm_device *pwm = &chip->pwms[i];

		radix_tree_delete(&pwm_tree, pwm->pwm);
		}

		@@ -254,7 +255,7 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip,
		if (ret < 0)
		goto out;

		chip->pwms = kzalloc(chip->npwm * sizeof(*pwm), GFP_KERNEL);
		chip->pwms = kcalloc(chip->npwm, sizeof(*pwm), GFP_KERNEL);
		if (!chip->pwms) {
		ret = -ENOMEM;
		goto out;