2013-06-05 21:30:06

by Alexey Khoroshilov

Subject: [PATCH] spi/sirf: fix error propagation in spi_sirfsoc_probe()

If pinctrl_get_select_default() fails, spi_sirfsoc_probe()
returns IS_ERR(sspi->p) instead of PTR_ERR(sspi->p).

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
drivers/spi/spi-sirf.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 0808cd5..94c3920 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -559,9 +559,10 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
sspi->bitbang.master->dev.of_node = pdev->dev.of_node;

sspi->p = pinctrl_get_select_default(&pdev->dev);
- ret = IS_ERR(sspi->p);
- if (ret)
+ if (IS_ERR(sspi->p)) {
+ ret = PTR_ERR(sspi->p);
goto free_master;
+ }

sspi->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(sspi->clk)) {
--
1.8.1.2

2013-06-06 01:37:06

by Barry Song

Subject: Re: [PATCH] spi/sirf: fix error propagation in spi_sirfsoc_probe()

2013/6/6 Alexey Khoroshilov <[email protected]>:
> If pinctrl_get_select_default() fails, spi_sirfsoc_probe()
> returns IS_ERR(sspi->p) instead of PTR_ERR(sspi->p).
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>

Acked-by: Barry Song <[email protected]>

> ---
> drivers/spi/spi-sirf.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
> index 0808cd5..94c3920 100644
> --- a/drivers/spi/spi-sirf.c
> +++ b/drivers/spi/spi-sirf.c
> @@ -559,9 +559,10 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
> sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
>
> sspi->p = pinctrl_get_select_default(&pdev->dev);
> - ret = IS_ERR(sspi->p);
> - if (ret)
> + if (IS_ERR(sspi->p)) {
> + ret = PTR_ERR(sspi->p);
> goto free_master;
> + }
>
> sspi->clk = clk_get(&pdev->dev, NULL);
> if (IS_ERR(sspi->clk)) {
> --
> 1.8.1.2

2013-06-06 01:40:47

by Barry Song

Subject: Re: [PATCH] spi/sirf: fix error propagation in spi_sirfsoc_probe()

2013/6/6 Barry Song <[email protected]>:
> 2013/6/6 Alexey Khoroshilov <[email protected]>:
>> If pinctrl_get_select_default() fails, spi_sirfsoc_probe()
>> returns IS_ERR(sspi->p) instead of PTR_ERR(sspi->p).
>>
>> Found by Linux Driver Verification project (linuxtesting.org).
>>
>> Signed-off-by: Alexey Khoroshilov <[email protected]>
>
> Acked-by: Barry Song <[email protected]>

sorry. nack, i think pinctrl_get_select_default(&pdev->dev) should
have been dropped in another patch.

>
>> ---
>> drivers/spi/spi-sirf.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
>> index 0808cd5..94c3920 100644
>> --- a/drivers/spi/spi-sirf.c
>> +++ b/drivers/spi/spi-sirf.c
>> @@ -559,9 +559,10 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
>> sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
>>
>> sspi->p = pinctrl_get_select_default(&pdev->dev);
>> - ret = IS_ERR(sspi->p);
>> - if (ret)
>> + if (IS_ERR(sspi->p)) {
>> + ret = PTR_ERR(sspi->p);
>> goto free_master;
>> + }
>>
>> sspi->clk = clk_get(&pdev->dev, NULL);
>> if (IS_ERR(sspi->clk)) {
>> --
>> 1.8.1.2

-barry