diff options
| author | Benedikt Niedermayr <[email protected]> | 2022-12-09 12:28:28 +0100 |
|---|---|---|
| committer | Krzysztof Kozlowski <[email protected]> | 2022-12-27 09:51:24 +0100 |
| commit | 827e0920dbfb0d92416e56081d70745597403446 (patch) | |
| tree | 9c79dc8198a1ff2b627cd3a4ed86c76b060e6696 | |
| parent | 1b929c02afd37871d5afb9d498426f83432e71c2 (diff) | |
memory: omap-gpmc: fix wait pin validation
This bug has been introduced after switching from -1 to UINT_MAX
for GPMC_WAITPIN_INVALID.
The bug leads to an error when the optional gpmc,wait-pin
dt-property is not used:
...
gpmc_cs_program_settings: invalid wait-pin (-1)
...
Signed-off-by: Benedikt Niedermayr <[email protected]>
Fixes: 8dd7e4af5853 ("memory: omap-gpmc: fix coverity issue "Control flow issues"")
Acked-by: Roger Quadros <[email protected]>
Tested-by: Tony Lindgren <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Krzysztof Kozlowski <[email protected]>
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 57d9f91fe89b..d78f73db37c8 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1918,7 +1918,8 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p) } } - if (p->wait_pin > gpmc_nr_waitpins) { + if (p->wait_pin != GPMC_WAITPIN_INVALID && + p->wait_pin > gpmc_nr_waitpins) { pr_err("%s: invalid wait-pin (%d)\n", __func__, p->wait_pin); return -EINVAL; } |