mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
spi: microchip-core: fix passing zero to PTR_ERR warning
It is possible that the error case for devm_clk_get() returns NULL,
in which case zero will be passed to PTR_ERR() as shown by the Smatch
static checker warning:
drivers/spi/spi-microchip-core.c:557 mchp_corespi_probe()
warn: passing zero to 'PTR_ERR'
Remove the NULL check and carry on with a dummy clock in case of an
error. To avoid a potential div zero, abort calculating clkgen if
clk_get_rate(spi->clk) is zero.
Fixes: 9ac8d17694
("spi: add support for microchip fpga spi controllers")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/linux-spi/20220615091633.GI2168@kadam/
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20220615142028.2991915-1-conor.dooley@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d52b095b6c
commit
2081ad1467
1 changed files with 3 additions and 1 deletions
|
@ -433,6 +433,8 @@ static int mchp_corespi_calculate_clkgen(struct mchp_corespi *spi,
|
||||||
unsigned long clk_hz, spi_hz, clk_gen;
|
unsigned long clk_hz, spi_hz, clk_gen;
|
||||||
|
|
||||||
clk_hz = clk_get_rate(spi->clk);
|
clk_hz = clk_get_rate(spi->clk);
|
||||||
|
if (!clk_hz)
|
||||||
|
return -EINVAL;
|
||||||
spi_hz = min(target_hz, clk_hz);
|
spi_hz = min(target_hz, clk_hz);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -553,7 +555,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
spi->clk = devm_clk_get(&pdev->dev, NULL);
|
spi->clk = devm_clk_get(&pdev->dev, NULL);
|
||||||
if (!spi->clk || IS_ERR(spi->clk)) {
|
if (IS_ERR(spi->clk)) {
|
||||||
ret = PTR_ERR(spi->clk);
|
ret = PTR_ERR(spi->clk);
|
||||||
dev_err(&pdev->dev, "could not get clk: %d\n", ret);
|
dev_err(&pdev->dev, "could not get clk: %d\n", ret);
|
||||||
goto error_release_master;
|
goto error_release_master;
|
||||||
|
|
Loading…
Reference in a new issue