Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a3f5af1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-4.6-rc4' of... 

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
parents c8c52850 ad06fdee

drivers/pwm/pwm-fsl-ftm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)