diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 15:57:35 +0300 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 15:57:35 +0300 |
| commit | c3499f0bc38d6db78f119f8f95d5d471e026ef88 (patch) | |
| tree | 0bd9a54686209b0ae81db58c4888a79f15a7370f /drivers/pwm/core.c | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| parent | 2907f8abb7ec3aec85ceaaf03dfbc16cca0018dc (diff) | |
| download | linux-c3499f0bc38d6db78f119f8f95d5d471e026ef88.tar.xz | |
Merge branch 'for-4.7/pwm-cleanup' into for-next
Diffstat (limited to 'drivers/pwm/core.c')
| -rw-r--r-- | drivers/pwm/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 7831bc6b51dd..2a1a2d566e39 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -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; |