diff mbox series

[2/6] nvmem: core: let stride and word_size default to 1

Message ID 20171215140609.17193-3-srinivas.kandagatla@linaro.org
State New
Headers show
Series nvmem: patches for v4.16 (Set 1) | expand

Commit Message

Srinivas Kandagatla Dec. 15, 2017, 2:06 p.m. UTC 
From: Heiner Kallweit <hkallweit1@gmail.com>


If the caller doesn't set stride and/or word_size in struct nvmem_config
then nvmem_register accepts this but we may face strange effects later
due to both values being 0. Therefore use 1 as default for both values.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

---
 drivers/nvmem/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.15.0
diff mbox series

Patch

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 93084ab61e0f..4f37c9f3d120 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -464,8 +464,8 @@  struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 	nvmem->owner = config->owner;
 	if (!nvmem->owner && config->dev->driver)
 		nvmem->owner = config->dev->driver->owner;
-	nvmem->stride = config->stride;
-	nvmem->word_size = config->word_size;
+	nvmem->stride = config->stride ?: 1;
+	nvmem->word_size = config->word_size ?: 1;
 	nvmem->size = config->size;
 	nvmem->dev.type = &nvmem_provider_type;
 	nvmem->dev.bus = &nvmem_bus_type;