Commit 6e6fb54d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.4-rc7' of... 

Merge tag 'regulator-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "One simple fix for v6.4, some incorrectly specified bitfield masks in
  the PCA9450 driver"

* tag 'regulator-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: pca9450: Fix LDO3OUT and LDO4OUT MASK
parents e075d681 7257d930

include/linux/regulator/pca9450.h

+2 −2
Original line number Diff line number Diff line
@@ -196,11 +196,11 @@ enum { 


/* PCA9450_REG_LDO3_VOLT bits */

#define LDO3_EN_MASK			0xC0

#define LDO3OUT_MASK			0x0F

#define LDO3OUT_MASK			0x1F



/* PCA9450_REG_LDO4_VOLT bits */

#define LDO4_EN_MASK			0xC0

#define LDO4OUT_MASK			0x0F

#define LDO4OUT_MASK			0x1F



/* PCA9450_REG_LDO5_VOLT bits */

#define LDO5L_EN_MASK			0xC0