| Message ID | 20201128081128.9669-1-ovidiu.panait@windriver.com |
|---|---|
| State | Accepted |
| Commit | 705082d4b1a2040c9f1ff2a7d5c4f2fccafde4bc |
| Delegated to: | Lokesh Vutla |
| Headers | show |
| Series | spi: ti_qspi: Fix "spi-max-frequency" error path in ti_qspi_ofdata_to_platdata | expand |
On 28/11/20 1:41 pm, Ovidiu Panait wrote: > struct ti_qspi_priv->max_hz is declared as unsigned int, so the following > error path check will always be false, even when "spi-max-frequency" > property is invalid/missing: > priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1); > if (priv->max_hz < 0) { > ... > } > > Replace the fdtdec call with dev_read_u32_default() and use 0 as the > default value. Error out if max_hz is zero. > > Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Applied to u-boot-ti/for-next Thanks and regards, Lokesh
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 5fdbb49442..91be18e0a7 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -467,8 +467,8 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus) priv->memory_map = map_physmem(mmap_addr, mmap_size, MAP_NOCACHE); priv->mmap_size = mmap_size; - priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1); - if (priv->max_hz < 0) { + priv->max_hz = dev_read_u32_default(bus, "spi-max-frequency", 0); + if (!priv->max_hz) { debug("Error: Max frequency missing\n"); return -ENODEV; }
struct ti_qspi_priv->max_hz is declared as unsigned int, so the following error path check will always be false, even when "spi-max-frequency" property is invalid/missing: priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1); if (priv->max_hz < 0) { ... } Replace the fdtdec call with dev_read_u32_default() and use 0 as the default value. Error out if max_hz is zero. Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- drivers/spi/ti_qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)