summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorLee Jones2016-09-14 12:14:30 +0200
committerLee Jones2016-10-04 16:48:05 +0200
commitc45eab2cb06092aa61e67fc6801cf0d6fac29482 (patch)
tree176ec4ff25fca237c097002844522053be9fe291 /include/linux/mfd
parentmfd: max8997-irq: 'inline' should be at the beginning of the declaration (diff)
downloadkernel-qcow2-linux-c45eab2cb06092aa61e67fc6801cf0d6fac29482.tar.gz
kernel-qcow2-linux-c45eab2cb06092aa61e67fc6801cf0d6fac29482.tar.xz
kernel-qcow2-linux-c45eab2cb06092aa61e67fc6801cf0d6fac29482.zip
mfd: ab8500-debugfs: Prevent initialised field from being over-written
Due to the lack of parity in the way array fields have been named/ numbered, a mistake was made where more debug fields were declared than actually existed. In doing so, 2 fields were added, which although unclear, were already declared in the array. The result was that the latter declarations trashed the former ones. This patch places the array back in the correct order and removes the offending NULL entries. While we're at it, let's ensure this doesn't happen again by naming each field properly and add a new *_LAST define to describe how many fields there should be. Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/abx500/ab8500.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 9475fee2bfc5..d33c245e75ca 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -63,6 +63,8 @@ enum ab8500_version {
#define AB8500_STE_TEST 0x14
#define AB8500_OTP_EMUL 0x15
+#define AB8500_DEBUG_FIELD_LAST 0x16
+
/*
* Interrupts
* Values used to index into array ab8500_irq_regoffset[] defined in