summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra30_i2s.c
diff options
context:
space:
mode:
authorSumit Bhattacharya <sumitb@nvidia.com>2011-12-13 16:15:48 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-15 12:12:01 +0530
commit48cf46caf9490b362e68106a87f4794d6a344208 (patch)
tree9207ed1a0bd386a47aa22460f6b6117bef544aa4 /sound/soc/tegra/tegra30_i2s.c
parentc7eca96f46f1162893f1031d406e22d2e20b061a (diff)
ASoC: Tegra: Fix I2s probe failure path
Don't free i2s context in I2s platform driver probe failure case since it is statically allocated. Change-Id: Ia1fb7e17493b8906a36e658ded925f0f414aae23 Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-on: http://git-master/r/69729 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson <speterson@nvidia.com> Reviewed-by: Nikesh Oswal <noswal@nvidia.com>
Diffstat (limited to 'sound/soc/tegra/tegra30_i2s.c')
-rw-r--r--sound/soc/tegra/tegra30_i2s.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 235a49b4b987..76ef1a484c9e 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -785,7 +785,7 @@ static __devinit int tegra30_i2s_platform_probe(struct platform_device *pdev)
if (IS_ERR(i2s->clk_i2s)) {
dev_err(&pdev->dev, "Can't retrieve i2s clock\n");
ret = PTR_ERR(i2s->clk_i2s);
- goto err_free;
+ goto exit;
}
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -827,9 +827,7 @@ err_release:
release_mem_region(mem->start, resource_size(mem));
err_clk_put:
clk_put(i2s->clk_i2s);
-err_free:
- kfree(i2s);
-
+exit:
return ret;
}