2017-07-07 05:59:38

by Gustavo A. R. Silva

Subject: [PATCH] mmc: mxcmmc: fix error return code in mxcmci_probe()

platform_get_irq() returns an error code, but the mxcmmc driver
ignores it and always returns -EINVAL. This is not correct,
and prevents -EPROBE_DEFER from being propagated properly.

Print error message and propagate the return value of
platform_get_irq on failure.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/mmc/host/mxcmmc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index fb3ca82..f3c2832 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -1014,8 +1014,10 @@ static int mxcmci_probe(struct platform_device *pdev)

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (irq < 0)
- return -EINVAL;
+ if (irq < 0) {
+ dev_err(&pdev->dev, "failed to get IRQ: %d\n", irq);
+ return irq;
+ }

mmc = mmc_alloc_host(sizeof(*host), &pdev->dev);
if (!mmc)
--
2.5.0

2017-07-11 14:43:33

by Ulf Hansson

Subject: Re: [PATCH] mmc: mxcmmc: fix error return code in mxcmci_probe()

On 7 July 2017 at 07:59, Gustavo A. R. Silva <[email protected]> wrote:
> platform_get_irq() returns an error code, but the mxcmmc driver
> ignores it and always returns -EINVAL. This is not correct,
> and prevents -EPROBE_DEFER from being propagated properly.
>
> Print error message and propagate the return value of
> platform_get_irq on failure.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Thanks, applied for next!

Kind regards
Uffe

> ---
> drivers/mmc/host/mxcmmc.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
> index fb3ca82..f3c2832 100644
> --- a/drivers/mmc/host/mxcmmc.c
> +++ b/drivers/mmc/host/mxcmmc.c
> @@ -1014,8 +1014,10 @@ static int mxcmci_probe(struct platform_device *pdev)
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> irq = platform_get_irq(pdev, 0);
> - if (irq < 0)
> - return -EINVAL;
> + if (irq < 0) {
> + dev_err(&pdev->dev, "failed to get IRQ: %d\n", irq);
> + return irq;
> + }
>
> mmc = mmc_alloc_host(sizeof(*host), &pdev->dev);
> if (!mmc)
> --
> 2.5.0
>

2017-07-17 04:53:26

by Gustavo A. R. Silva

Subject: Re: [PATCH] mmc: mxcmmc: fix error return code in mxcmci_probe()

Hi Ulf,

On 07/11/2017 09:43 AM, Ulf Hansson wrote:
> On 7 July 2017 at 07:59, Gustavo A. R. Silva <[email protected]> wrote:
>> platform_get_irq() returns an error code, but the mxcmmc driver
>> ignores it and always returns -EINVAL. This is not correct,
>> and prevents -EPROBE_DEFER from being propagated properly.
>>
>> Print error message and propagate the return value of
>> platform_get_irq on failure.
>>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> Thanks, applied for next!
>

Thank you!

> Kind regards
> Uffe
>
>> ---
>> drivers/mmc/host/mxcmmc.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
>> index fb3ca82..f3c2832 100644
>> --- a/drivers/mmc/host/mxcmmc.c
>> +++ b/drivers/mmc/host/mxcmmc.c
>> @@ -1014,8 +1014,10 @@ static int mxcmci_probe(struct platform_device *pdev)
>>
>> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> irq = platform_get_irq(pdev, 0);
>> - if (irq < 0)
>> - return -EINVAL;
>> + if (irq < 0) {
>> + dev_err(&pdev->dev, "failed to get IRQ: %d\n", irq);
>> + return irq;
>> + }
>>
>> mmc = mmc_alloc_host(sizeof(*host), &pdev->dev);
>> if (!mmc)
>> --
>> 2.5.0
>>

--
Gustavo A. R. Silva