aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-30 16:51:04 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-13 00:11:24 +0800
commit443e67ed8d40c0e08619f087da4332dbbff47954 (patch)
tree41c4fbbe7f29a9441ec8febd2f3f6a8e86c2713d /drivers/mfd
parentmfd: Constify WM8994 regulator_init_data (diff)
downloadlinux-dev-443e67ed8d40c0e08619f087da4332dbbff47954.tar.xz
linux-dev-443e67ed8d40c0e08619f087da4332dbbff47954.zip
mfd: Correct revision display for WM1811 revision D
As WM1811 revision C was transparent to software the revision IDs for subsequent revisions are one less than they would normally be. Correct for this in log messages. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm8994-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index f9c4016baea6..12bd0eed0b2e 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -460,6 +460,11 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
break;
}
break;
+ case WM1811:
+ /* Revision C did not change the relevant layer */
+ if (ret > 1)
+ ret++;
+ break;
default:
break;
}