summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-15 05:02:06 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-15 05:02:06 +0300
commit0a3f5af188c4f7df44517e50bee4dbf87c256813 (patch)
tree4ba8624a2b13c7ffa9ae0df1ca2806a53f783e1a
parentc8c52850e642117899d592682ce857df00cdc753 (diff)
parentad06fdeeef1cbadf86ebbe510e8079abada8b44e (diff)
downloadlinux-0a3f5af188c4f7df44517e50bee4dbf87c256813.tar.xz
Merge tag 'pwm/for-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm fix from Thierry Reding: "A single one-line fix to turn the regmap cache from an RB-tree to a flat cache to avoid lockdep and abort issues" * tag 'pwm/for-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: pwm: fsl-ftm: Use flat regmap cache
-rw-r--r--drivers/pwm/pwm-fsl-ftm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c
index 7225ac6b3df5..fad968eb75f6 100644
--- a/drivers/pwm/pwm-fsl-ftm.c
+++ b/drivers/pwm/pwm-fsl-ftm.c
@@ -392,7 +392,7 @@ static const struct regmap_config fsl_pwm_regmap_config = {
.max_register = FTM_PWMLOAD,
.volatile_reg = fsl_pwm_volatile_reg,
- .cache_type = REGCACHE_RBTREE,
+ .cache_type = REGCACHE_FLAT,
};
static int fsl_pwm_probe(struct platform_device *pdev)