Groups > linux.kernel > #1194685

[PATCH 11/11] staging: rtl8192e: probe: iounmap mmio when probe fails

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 11/11] staging: rtl8192e: probe: iounmap mmio when probe fails
Date	Tue, 28 Jul 2015 23:40:02 +0200
Message-ID	<pRkLo-4Fc-11@gated-at.bofh.it> (permalink)
References	<pRkLn-4Fc-5@gated-at.bofh.it>
X-Original-To	gregkh@linuxfoundation.org
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=thhfuv+R4xxbtTK+NM33F9Yv1LZ0bfZndb/WVc5Zsb8=; b=k8COSyKtTSJlc4/h1BkesWt4YLvVYFrbJ2KK6NwaG67RpgiqmQfxSDFOA8vCA/ew2E y/sKxVnVQsy1wjRilYuO2Zr2Y0K3+soEQdf0Vq4MbrmnCtB/vD/aRmtO8T/HYBhMjzuG d5H4N+Ej73tM01q18LBCpBeCkF6+JvT5i15LKi/COhw6Nb0azE01V5SMM+TyjCmTU7Jx wSfw6dcQA588sZnAk5hJcjBDF09NrXZsxfg0lOgBV/rwryi4+i5Vtk7ume6DNa3FrWMN t3JpmUpyFqsjjsTjhYted/sFR1S6zsxnR6snEUUeb9xYFjZVLO/cWYzc/wd5BRuUZIxB bQww==
X-Received	by 10.152.170.234 with SMTP id ap10mr35211620lac.28.1438119134079; Tue, 28 Jul 2015 14:32:14 -0700 (PDT)
X-Mailer	git-send-email 1.8.4.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	Mateusz Kulikowski <mateusz.kulikowski@gmail.com>, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
X-Original-Date	Tue, 28 Jul 2015 23:31:47 +0200
X-Original-Message-ID	<1438119107-26176-12-git-send-email-mateusz.kulikowski@gmail.com>
X-Original-References	<1438119107-26176-1-git-send-email-mateusz.kulikowski@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1194685

Show key headers only | View raw

In case of probe failure, io memory was not released properly.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 0033cfb..c868cb37 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2642,12 +2642,12 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
 	pci_read_config_byte(pdev, 0x08, &revision_id);
 	/* If the revisionid is 0x10, the device uses rtl8192se. */
 	if (pdev->device == 0x8192 && revision_id == 0x10)
-		goto err_rel_mem;
+		goto err_unmap;
 
 	priv->ops = ops;
 
 	if (rtl92e_check_adapter(pdev, dev) == false)
-		goto err_rel_mem;
+		goto err_unmap;
 
 	dev->irq = pdev->irq;
 	priv->irq = 0;
@@ -2688,6 +2688,8 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
 err_free_irq:
 	free_irq(dev->irq, dev);
 	priv->irq = 0;
+err_unmap:
+	iounmap((void __iomem *)ioaddr);
 err_rel_mem:
 	release_mem_region(pmem_start, pmem_len);
 err_rel_rtllib:
-- 
1.8.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 11/11] staging: rtl8192e: probe: iounmap mmio when probe fails Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-28 23:40 +0200

csiph-web