From patchwork Sat Feb 6 21:23:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 579909 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C5A2D140556 for ; Sun, 7 Feb 2016 08:24:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752679AbcBFVXe (ORCPT ); Sat, 6 Feb 2016 16:23:34 -0500 Received: from smtp05.smtpout.orange.fr ([80.12.242.127]:27913 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752119AbcBFVXe (ORCPT ); Sat, 6 Feb 2016 16:23:34 -0500 Received: from belgarion.home ([109.222.219.121]) by mwinf5d61 with ME id F9PX1s00H2dl3Th039PXLZ; Sat, 06 Feb 2016 22:23:33 +0100 X-ME-Helo: belgarion.home X-ME-Date: Sat, 06 Feb 2016 22:23:33 +0100 X-ME-IP: 109.222.219.121 From: Robert Jarzmik To: Nicolas Pitre , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Robert Jarzmik , Sergei Shtylyov Subject: [PATCH v2] net: smc91x: propagate irq return code Date: Sat, 6 Feb 2016 22:23:20 +0100 Message-Id: <1454793800-7789-1-git-send-email-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The smc91x driver doesn't honor the probe deferral mechanism when the interrupt source is not yet available, such as one provided by a gpio controller not probed. Fix this by propagating the platform_get_irq() error code as the probe return value. Signed-off-by: Robert Jarzmik Cc: Sergei Shtylyov --- Since v1: change the irq test to < 0 --- drivers/net/ethernet/smsc/smc91x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 0e2fc1a844ab..db7db8ac4ca3 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2342,8 +2342,8 @@ static int smc_drv_probe(struct platform_device *pdev) } ndev->irq = platform_get_irq(pdev, 0); - if (ndev->irq <= 0) { - ret = -ENODEV; + if (ndev->irq < 0) { + ret = ndev->irq; goto out_release_io; } /*