diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2016-12-12 22:05:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-12-12 22:05:20 +0100 |
| commit | 152fce5a2371f64c57abf99dbb0600cc18d399d4 (patch) | |
| tree | f3b4b8c2cf88cbd5a4a880f8c74b5d23f3f24982 /drivers/pwm | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next (diff) | |
| download | linux-dev-152fce5a2371f64c57abf99dbb0600cc18d399d4.tar.xz linux-dev-152fce5a2371f64c57abf99dbb0600cc18d399d4.zip | |
Merge tag 'asoc-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.10
There's been a few bits of framework work this time around and quite a
lot of cleanups and improvements to existing code:
- Support for stereo DAPM controls from Chen-yu Tsai.
- Some initial work on the of-graph sound card from Morimoto-san, the
main bulk of this is currently in binding review.
- Lots of Renesas cleanups from Morimoto-san and sunxi work from
Chen-yu Tsai.
- regmap conversions of the remaining AC'97 drivers from Lars-Peter
Clausen.
- A new version of the topology ABI from Mengdong Lin.
- New drivers for Cirrus Logic CS42L42, Qualcomm MSM8916-WCD, and Realtek
RT5665.
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/pwm-meson.c | 1 | ||||
| -rw-r--r-- | drivers/pwm/sysfs.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 381871b2bb46..9d5bd7d5c610 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -474,6 +474,7 @@ static int meson_pwm_probe(struct platform_device *pdev) if (IS_ERR(meson->base)) return PTR_ERR(meson->base); + spin_lock_init(&meson->lock); meson->chip.dev = &pdev->dev; meson->chip.ops = &meson_pwm_ops; meson->chip.base = -1; diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index 0296d8178ae2..a813239300c3 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -425,6 +425,8 @@ void pwmchip_sysfs_unexport_children(struct pwm_chip *chip) if (test_bit(PWMF_EXPORTED, &pwm->flags)) pwm_unexport_child(parent, pwm); } + + put_device(parent); } static int __init pwm_sysfs_init(void) |