commit acc22ce6b49da1153a2fc0c45461a32f7c12c742
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 11 03:26:15 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 11 03:26:15 2014 -0700
tree 47d810f5dc1a38e3e771748c2112b556202f7f72
parent dbd20ec6264b219e559c4f8e4acc7ad044de0fc1
parent c0149b8d7630ec1e545bdc242e2f11acd3b7db7f

Merge "ASoC: msm: qdsp6v2: Fix ion_import failure"

arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c

diff --git a/arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c b/arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c
index 399e073..df7760a 100644
--- a/arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c
+++ b/arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c
@@ -344,7 +344,7 @@
 		pr_err("%s: ion import dma buffer failed\n",
 			__func__);
 		rc = -EINVAL;
-		goto err_destroy_client;
+		goto err;
 	}
 
 	if (ionflag != NULL) {
@@ -380,10 +380,6 @@
 
 err_ion_handle:
 	ion_free(client, *handle);
-err_destroy_client:
-	msm_audio_ion_client_destroy(client);
-	client = NULL;
-	*handle = NULL;
 err:
 	return rc;
 }