[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPgLHd_RTomuGFrwReDt6w9q+nH376W=6hHD4qZ4PGQXRGnJqA@mail.gmail.com>
Date: Mon, 13 May 2013 17:00:44 +0800
From: Wei Yongjun <weiyj.lk@...il.com>
To: lgirdwood@...il.com, broonie@...nel.org, perex@...ex.cz,
tiwai@...e.de, wfp5p@...ginia.edu, vinod.koul@...ux.intel.com,
ramesh.babu@...el.com, namartax.kohli@...el.com
Cc: yongjun_wei@...ndmicro.com.cn, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org
Subject: [PATCH -next] ASoC: mid-x86: add missing iounmap() to probe error and remove
From: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
Add the missing iounmap() before return from snd_mfld_mc_probe()
in the error handling case and to snd_mfld_mc_remove().
Signed-off-by: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
---
sound/soc/mid-x86/mfld_machine.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 78d5825..8206e84 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -397,7 +397,7 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
IRQF_SHARED, pdev->dev.driver->name, mc_drv_ctx);
if (ret_val) {
pr_err("cannot register IRQ\n");
- goto unalloc;
+ goto unmap;
}
/* register the soc card */
snd_soc_card_mfld.dev = &pdev->dev;
@@ -412,6 +412,8 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
freeirq:
free_irq(irq, mc_drv_ctx);
+unmap:
+ iounmap(mc_drv_ctx->int_base);
unalloc:
kfree(mc_drv_ctx);
return ret_val;
@@ -424,6 +426,7 @@ static int snd_mfld_mc_remove(struct platform_device *pdev)
pr_debug("snd_mfld_mc_remove called\n");
free_irq(platform_get_irq(pdev, 0), mc_drv_ctx);
snd_soc_unregister_card(&snd_soc_card_mfld);
+ iounmap(mc_drv_ctx->int_base);
kfree(mc_drv_ctx);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists