summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/88pm800.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-27 20:15:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-27 20:15:16 +0200
commit722b262c966a388a1f8bfcdd100cd19c4ce59ab9 (patch)
tree34e755b07dbca16f65ad7eb5bb1fade06032cebf /drivers/regulator/88pm800.c
parentdrivers: usb: fsl: Define usb control register mask for w1c bits (diff)
parentLinux 4.2-rc4 (diff)
downloadlinux-722b262c966a388a1f8bfcdd100cd19c4ce59ab9.tar.xz
linux-722b262c966a388a1f8bfcdd100cd19c4ce59ab9.zip
Merge 4.2-rc4 into usb-next
We want the USB fixes that went into that release in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator/88pm800.c')
-rw-r--r--drivers/regulator/88pm800.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c
index 832932bdc977..7fd4f511d78f 100644
--- a/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@ -130,7 +130,7 @@ struct pm800_regulators {
.owner = THIS_MODULE, \
.n_voltages = ARRAY_SIZE(ldo_volt_table), \
.vsel_reg = PM800_##vreg##_VOUT, \
- .vsel_mask = 0x1f, \
+ .vsel_mask = 0xf, \
.enable_reg = PM800_##ereg, \
.enable_mask = 1 << (ebit), \
.volt_table = ldo_volt_table, \