diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2017-12-15 17:06:05 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-19 12:39:33 +0300 |
commit | 99897efd5aa0e9671946297ede45840bc2052c07 (patch) | |
tree | 0211913b3b1195e9163eca35be5fa3415ee44377 | |
parent | 9f3044c38c84989c37a6f29683a8899a2980341d (diff) | |
download | linux-99897efd5aa0e9671946297ede45840bc2052c07.tar.xz |
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 <hkallweit1@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/nvmem/core.c | 4 |
1 files 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; |