From patchwork Wed Jan 5 08:40:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 77575 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 C26CEB7110 for ; Wed, 5 Jan 2011 19:38:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751622Ab1AEIiP (ORCPT ); Wed, 5 Jan 2011 03:38:15 -0500 Received: from mail-yi0-f46.google.com ([209.85.218.46]:64588 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751383Ab1AEIiO (ORCPT ); Wed, 5 Jan 2011 03:38:14 -0500 Received: by yib18 with SMTP id 18so3718920yib.19 for ; Wed, 05 Jan 2011 00:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=OMfeh1VQ3hPHhkU/Hd2OhMjrKDEVUz+ovUJjRmmzsXU=; b=VXbNmSXj3YNrD6ynW7/Y54wLa4AQsE9LkFqQXzstxP4a53BjLll76m8tqyh4UNV6ym WXtJJyX9MmMipYSbBnKPvXT3KD1t4nNF1XuYCWMpAEf6pm2W1lIAeN/VmVgFKLQKLmup Eepbb1Jfzv8gMfHQmQnt0nyAXoht8bPYEycas= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=cHyH3CTEVwJulzzJpG3oEnuEwmL9M0kkC3Ough/w642uip4hBCgcY2HpBeub1cZqLl P6cqbFape0D7Gs6VlIcWjGj6FkPU8tESc6ApFB3PRHD8R2ThMQwZlcRB6DUvP48x53+1 eDJxElHZLOQOIwfM7Prr9tYVD6I9meYa3myMc= Received: by 10.90.103.13 with SMTP id a13mr380917agc.143.1294216693733; Wed, 05 Jan 2011 00:38:13 -0800 (PST) Received: from [192.168.100.50] (60-251-136-127.HINET-IP.hinet.net [60.251.136.127]) by mx.google.com with ESMTPS id d4sm755416and.39.2011.01.05.00.38.11 (version=SSLv3 cipher=RC4-MD5); Wed, 05 Jan 2011 00:38:12 -0800 (PST) Subject: [PATCH] net: r6040: Return proper error for r6040_init_one From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , "David S. Miller" , netdev@vger.kernel.org Date: Wed, 05 Jan 2011 16:40:04 +0800 Message-Id: <1294216804.19064.2.camel@mola> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc failure. Signed-off-by: Axel Lin Acked-by: Florian Fainelli --- drivers/net/r6040.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 0b014c89..27e6f6d 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -1153,6 +1153,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, lp->mii_bus = mdiobus_alloc(); if (!lp->mii_bus) { dev_err(&pdev->dev, "mdiobus_alloc() failed\n"); + err = -ENOMEM; goto err_out_unmap; } @@ -1165,6 +1166,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); if (!lp->mii_bus->irq) { dev_err(&pdev->dev, "mii_bus irq allocation failed\n"); + err = -ENOMEM; goto err_out_mdio; }