From patchwork Sat Jul 10 10:03:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58468 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 98E73B6F0C for ; Sat, 10 Jul 2010 20:03:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753632Ab0GJKDu (ORCPT ); Sat, 10 Jul 2010 06:03:50 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:64749 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752596Ab0GJKDs (ORCPT ); Sat, 10 Jul 2010 06:03:48 -0400 Received: by qwh6 with SMTP id 6so738574qwh.19 for ; Sat, 10 Jul 2010 03:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=WgCv+S3WFjoQiypdIZJ+uCDGJLztIdRbrVw4FQ1T6M8=; b=JMwJKLmuRNnQ8aouOG5P3C6326YCvQ7G0Gscs93g5ThH5CiTjWTAMZ56IFjJ/EmlUK JI5wvPF0gHf1KmhNY2jz5MC36z1wG6OK+k9KcNte6f9TcqRHNxv4eUUfSbO8VWu1LHEt rESxikgg4Tr5JP9EERWV7JUPBjccPhVwOWw2Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=PMcOebS0VquMGKdg2rgQPjhA6RSlxHKGtnyHHuHnIHZS+0MoOBFC2APqV+St8siVCw H1UIC1HeFYDzccpLObp+ufuHCn9Q6ei+8FwL2Md56zQZN6t2fPw8Sa1Hdn1hh7ExYfof i68jM0sLlDs3zHAxQ0a5J7wlso7OtE7v8Ehzc= Received: by 10.224.88.78 with SMTP id z14mr6289847qal.136.1278756227841; Sat, 10 Jul 2010 03:03:47 -0700 (PDT) Received: from localhost ([213.87.80.206]) by mx.google.com with ESMTPS id e32sm8519535qcg.34.2010.07.10.03.03.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 10 Jul 2010 03:03:46 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: "David S. Miller" , Atsushi Nemoto , Jiri Pirko , Eric Dumazet , Alexey Dobriyan , netdev@vger.kernel.org Subject: [PATCH] tc35815: fix iomap leak Date: Sat, 10 Jul 2010 14:03:18 +0400 Message-Id: <1278756199-4636-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If tc35815_init_one() fails we must unmap mapped regions. Signed-off-by: Kulikov Vasiliy --- drivers/net/tc35815.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index be08b75..99afa5c 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -854,7 +854,7 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev, rc = register_netdev(dev); if (rc) - goto err_out; + goto err_out_iounmap; memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n", @@ -872,6 +872,8 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev, err_out_unregister: unregister_netdev(dev); +err_out_iounmap: + pcim_iounmap_regions(pdev, 1 << 1); err_out: free_netdev(dev); return rc;