From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 11/11] staging: rtl8192e: probe: iounmap mmio when probe fails
Date: Tue, 28 Jul 2015 23:31:47 +0200 [thread overview]
Message-ID: <1438119107-26176-12-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1438119107-26176-1-git-send-email-mateusz.kulikowski@gmail.com>
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
prev parent reply other threads:[~2015-07-28 21:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 21:31 [PATCH 00/11] staging: rtl8192e: More cleanups Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 01/11] staging: rtl8192e: Remove rtl8192_phy_updateInitGain Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 02/11] staging: rtl8192e: Remove ActUpdateChannelAccessSetting Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 03/11] staging: rtl8192e: Remove rtl8192_data_hard_stop Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 04/11] staging: rtl8192e: Remove rtl8192_data_hard_resume Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 05/11] staging: rtl8192e: MgntActSet_RF_State: remove ProtectOrNot parameter Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 06/11] staging: rtl8192e: Simplify rtl92e_is_halfn_supported_by_ap Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 07/11] staging: rtl8192e: Simplify rtl92e_set_bandwidth Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 08/11] staging: rtl8192e: Remove phy_RF8256_Config_ParaFile Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 09/11] staging: rtl8192e: Fix IW_IOCTL macro Mateusz Kulikowski
2015-07-28 21:31 ` [PATCH 10/11] staging: rtl8192e: Drop large switch in rtl92e_config_rf Mateusz Kulikowski
2015-07-28 21:31 ` Mateusz Kulikowski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438119107-26176-12-git-send-email-mateusz.kulikowski@gmail.com \
--to=mateusz.kulikowski@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®