From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753749AbcIIJqJ (ORCPT ); Fri, 9 Sep 2016 05:46:09 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:35826 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbcIIJqH (ORCPT ); Fri, 9 Sep 2016 05:46:07 -0400 MIME-Version: 1.0 In-Reply-To: <20160906125633.1563621-1-arnd@arndb.de> References: <20160906125633.1563621-1-arnd@arndb.de> From: Ulf Hansson Date: Fri, 9 Sep 2016 11:46:05 +0200 Message-ID: Subject: Re: [PATCH] mmc: davinci: remove incorrect NO_IRQ use To: Arnd Bergmann Cc: David Lechner , Peter Ujfalusi , Jaehoon Chung , linux-mmc , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6 September 2016 at 14:56, Arnd Bergmann 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 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 >