From patchwork Wed Sep 28 14:49:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 676284 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3skgcf6Gvsz9srZ for ; Thu, 29 Sep 2016 00:50:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=sJ+EpNhO; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3skgcf5CGPzDrYr for ; Thu, 29 Sep 2016 00:50:58 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=sJ+EpNhO; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3skgZr2LQfzDrYv for ; Thu, 29 Sep 2016 00:49:24 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=sJ+EpNhO; dkim-atps=neutral Received: by mail-pf0-x243.google.com with SMTP id 21so2258757pfy.1 for ; Wed, 28 Sep 2016 07:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/hVlU9cp9e68zQhZzIJJVDdGTrBbsiHNADHTWpQc24E=; b=sJ+EpNhO2s5Bp/8a5sItpa+KaaWIgfCR6pyAeK2sMLYqqRIcTPfEtU9Dw6njp5PNVU seDJgRHhjOcubglYhgNXTT5N+U3bXfyIKKRgZwxG7Of+MwthObd/zBIWBNc93xt3xkwg rpQAELEc0PI89+wvzaRTT7WVQV5u5p1vLD+AuUWXlYyrg376YnnURzkPbqrE+g/2LEks +pVOexhIqCqcvixV22smy8MB8PLThY4IJP+yMcZEf0ClCwx++0Hrp5+bHoJ9Mf5zz6LX KVWx4n09u3pFnOJiniU1ks82QxmptEeXo8Jb1c3Yrxqu89bn1CjyxFLpMlf1qzpIpqKL uizg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/hVlU9cp9e68zQhZzIJJVDdGTrBbsiHNADHTWpQc24E=; b=hdZR4jouAowJt1brienNGVvgpxvqyj0oBa0mVYUB1pvV6Shrqt81SyDp95kx7vLNt3 CxnUFG7SsG3MDH98dPF5TVrUnetPyQENKw3fCIv7yJBVEDuoQqxb80qlnAcyELC466zu /pvhe07bDHiAxVASPjZpzgJ4oA/2G4lvJl5DfrfSPdxISDbuZsUnlcOxRT0IvlSkJoo/ P2nSXfa73Z18sPHrRN2+lRkcpbe/dqP2TTb7q2sAGCgmfVu9ocpN4Nmmxd6yAit8vxzR WqFN/vq5C9PDOeku3NwQ4WKYiFoQV5KWFfG8bNI/Se5MS+5DarFtgiDMNJ9MBKBgWhO6 dNHw== X-Gm-Message-State: AE9vXwP+FlPjnNqwCGOSFZ9zH9tahCZfiOFBSsSj92wrTEtfVmTpuI2PMC3tRFfM3Hyr3Q== X-Received: by 10.98.216.6 with SMTP id e6mr58515980pfg.106.1475074162397; Wed, 28 Sep 2016 07:49:22 -0700 (PDT) Received: from 192.168.0.37 (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id q14sm13275203pfg.63.2016.09.28.07.49.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Sep 2016 07:49:21 -0700 (PDT) From: Wei Yongjun To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH -next] powerpc/4xx: Fix error return code in ppc4xx_msi_probe() Date: Wed, 28 Sep 2016 14:49:12 +0000 Message-Id: <1475074152-12932-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Wei Yongjun , linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wei Yongjun Fix to return a negative error code from the ppc4xx_setup_pcieh_hw() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- arch/powerpc/sysdev/ppc4xx_msi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c index 590dab4..b729d44 100644 --- a/arch/powerpc/sysdev/ppc4xx_msi.c +++ b/arch/powerpc/sysdev/ppc4xx_msi.c @@ -242,7 +242,8 @@ static int ppc4xx_msi_probe(struct platform_device *dev) if (!msi_irqs) return -ENODEV; - if (ppc4xx_setup_pcieh_hw(dev, res, msi)) + err = ppc4xx_setup_pcieh_hw(dev, res, msi); + if (err) goto error_out; err = ppc4xx_msi_init_allocator(dev, msi);