MFD_ARRAY_SIZE() would not accurately return 0 if the passed
parameter was NULL. Fix this so that num_resources will
accurately be 0 in the case that _res is NULL.
cc: Lee Jones <lee.jo...@linaro.org>
cc: Laxman Dewangan <ldewan...@nvidia.com>
Signed-off-by: Rhyland Klein <rkl...@nvidia.com>
---
include/linux/mfd/core.h | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 1a5a87f3cd38..62136ccff1df 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -18,11 +18,11 @@
#define MFD_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#define MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, _match)
\
+#define MFD_CELL_ALL(_name, _nres, _res, _pdata, _id, _compat, _match) \
{ \
.name = (_name), \
.resources = (_res), \
- .num_resources = MFD_ARRAY_SIZE((_res)), \
+ .num_resources = (_nres), \
.platform_data = (_pdata), \
.pdata_size = MFD_ARRAY_SIZE((_pdata)), \
.of_compatible = (_compat), \
@@ -31,16 +31,19 @@
}
#define OF_MFD_CELL(_name, _res, _pdata, _id, _compat) \
- MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, NULL) \
+ MFD_CELL_ALL(_name, MFD_ARRAY_SIZE((_res)), _res, \
+ _pdata, _id, _compat, NULL) \
#define ACPI_MFD_CELL(_name, _res, _pdata, _id, _match)
\
- MFD_CELL_ALL(_name, _res, _pdata, _id, NULL, _match) \
+ MFD_CELL_ALL(_name, MFD_ARRAY_SIZE((_res)), _res, \
+ _pdata, _id, NULL, _match) \
#define MFD_CELL_BASIC(_name, _res, _pdata, _id) \
- MFD_CELL_ALL(_name, _res, _pdata, _id, NULL, NULL) \
+ MFD_CELL_ALL(_name, MFD_ARRAY_SIZE((_res)), _res, \
+ _pdata, _id, NULL, NULL) \
#define MFD_CELL_NAME(_name) \
- MFD_CELL_ALL(_name, NULL, NULL, 0, NULL, NULL) \
+ MFD_CELL_ALL(_name, 0, NULL, NULL, 0, NULL, NULL) \
struct irq_domain;
struct property_set;
--
1.9.1
