diff mbox

mmc: mxcmmc: fix error return code in mxcmci_probe()

Message ID 20170707055928.GA11041@embeddedgus (mailing list archive)
State Accepted
Headers show

Commit Message

Gustavo A. R. Silva July 7, 2017, 5:59 a.m. UTC
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 <garsilva@embeddedor.com>
---
 drivers/mmc/host/mxcmmc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Ulf Hansson July 11, 2017, 2:43 p.m. UTC | #1
On 7 July 2017 at 07:59, Gustavo A. R. Silva <garsilva@embeddedor.com> 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 <garsilva@embeddedor.com>

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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Gustavo A. R. Silva July 17, 2017, 4:53 a.m. UTC | #2
Hi Ulf,

On 07/11/2017 09:43 AM, Ulf Hansson wrote:
> On 7 July 2017 at 07:59, Gustavo A. R. Silva <garsilva@embeddedor.com> 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 <garsilva@embeddedor.com>
>
> 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
>>
diff mbox

Patch

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)