From 99897efd5aa0e9671946297ede45840bc2052c07 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Fri, 15 Dec 2017 14:06:05 +0000 Subject: [PATCH] nvmem: core: let stride and word_size default to 1 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 Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.11.0