From patchwork Thu Jul 29 08:27:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 60196 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 87343B70B4 for ; Thu, 29 Jul 2010 18:28:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754527Ab0G2I2G (ORCPT ); Thu, 29 Jul 2010 04:28:06 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:54838 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754408Ab0G2I2B (ORCPT ); Thu, 29 Jul 2010 04:28:01 -0400 Received: by eya25 with SMTP id 25so21631eya.19 for ; Thu, 29 Jul 2010 01:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=exMTnJNnRQATIfOU9B6r9uEIEJ+qSJTde7BD29+5axQ=; b=tYv5tct4phxCif21AZ1s80i4b24Yv3RtBQHgQ3LrnMrsSFW9WbDLLHbPyGbNRG8iiS /OI9HsFS8WIycQpbzxruuEks0SoHJU243ua24cl1g0TBvPxOloq+bgbH2k7kZObPu9TJ E/BEQsOw1HxNJZYU0fQO9i/nFNx04zf+UJh2M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=ZMZeo7+bAqfzA12B1IQGAn7PFmfUPd8Gx5/AOZcYJYR6kJXTj1Y2bC4hroxCflMZTq FWPrLPAqHv89I21IGjUbLjTovBcE+tjj/SumFsK5xTqBx3TQB+eIA0VYw5sV5wWg+1G7 bsULGDoZsRXcM7pq6fVDbrXGbm6FRihaxupic= Received: by 10.213.76.16 with SMTP id a16mr4353827ebk.90.1280392080254; Thu, 29 Jul 2010 01:28:00 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id v8sm854871eeh.8.2010.07.29.01.27.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 29 Jul 2010 01:27:59 -0700 (PDT) Date: Thu, 29 Jul 2010 10:27:29 +0200 From: Dan Carpenter To: netdev@vger.kernel.org Cc: Stephen Hemminger , Eric Dumazet , Frans Pop , Richard Cochran , "David S. Miller" , kernel-janitors@vger.kernel.org Subject: [patch] dnet: fixup error handling in initialization Message-ID: <20100729082729.GS26313@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There were two problems here. We returned success if dnet_mii_init() failed and there was a release_mem_region() missing. Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index 4ea7141..7c07575 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c @@ -854,7 +854,7 @@ static int __devinit dnet_probe(struct platform_device *pdev) dev = alloc_etherdev(sizeof(*bp)); if (!dev) { dev_err(&pdev->dev, "etherdev alloc failed, aborting.\n"); - goto err_out; + goto err_out_release_mem; } /* TODO: Actually, we have some interesting features... */ @@ -911,7 +911,8 @@ static int __devinit dnet_probe(struct platform_device *pdev) if (err) dev_warn(&pdev->dev, "Cannot register PHY board fixup.\n"); - if (dnet_mii_init(bp) != 0) + err = dnet_mii_init(bp); + if (err) goto err_out_unregister_netdev; dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n", @@ -936,6 +937,8 @@ err_out_iounmap: iounmap(bp->regs); err_out_free_dev: free_netdev(dev); +err_out_release_mem: + release_mem_region(mem_base, mem_size); err_out: return err; }