lkml.org 
[lkml]   [2016]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] mmc: davinci: remove incorrect NO_IRQ use
On 6 September 2016 at 14:56, Arnd Bergmann <arnd@arndb.de> wrote:
> platform_get_irq() returns an error value on failure, not NO_IRQ,
> so the error handling here could never work.
>
> This changes the code to propagate the error value instead.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks, applied for next!

Kind regards
Uffe

> ---
> drivers/mmc/host/davinci_mmc.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index c521559412fc..67ef4810b3de 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -1216,9 +1216,11 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
> }
>
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - irq = platform_get_irq(pdev, 0);
> - if (!r || irq == NO_IRQ)
> + if (!r)
> return -ENODEV;
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
>
> mem_size = resource_size(r);
> mem = devm_request_mem_region(&pdev->dev, r->start, mem_size,
> --
> 2.9.0
>

\
 
 \ /
  Last update: 2016-09-17 09:58    [W:0.049 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site