Merge "msm: ipa: change to use vzalloc API instead" (b0f900ce) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/ipa/ipa_qmi_service.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <linux/uaccess.h>
		#include <soc/qcom/subsystem_restart.h>
		#include <linux/ipa.h>
		#include <linux/vmalloc.h>

		#include "ipa_qmi_service.h"
		#include "ipa_ram_mmap.h"
		@@ -791,15 +792,17 @@ static void ipa_qmi_service_init_worker(struct work_struct *work)
		IPAWANDBG("IPA A7 QMI init OK :>>>>\n");

		/* start the QMI msg cache */
		ipa_qmi_ctx = kzalloc(sizeof(*ipa_qmi_ctx), GFP_KERNEL);
		ipa_qmi_ctx = vzalloc(sizeof(*ipa_qmi_ctx));
		if (!ipa_qmi_ctx) {
		IPAWANERR(":kzalloc err.\n");
		IPAWANERR(":vzalloc err.\n");
		return;
		}

		ipa_svc_workqueue = create_singlethread_workqueue("ipa_A7_svc");
		if (!ipa_svc_workqueue) {
		IPAWANERR("Creating ipa_A7_svc workqueue failed\n");
		vfree(ipa_qmi_ctx);
		ipa_qmi_ctx = NULL;
		return;
		}

		@@ -863,6 +866,8 @@ destroy_qmi_handle:
		destroy_ipa_A7_svc_wq:
		destroy_workqueue(ipa_svc_workqueue);
		ipa_svc_workqueue = NULL;
		vfree(ipa_qmi_ctx);
		ipa_qmi_ctx = NULL;
		return;
		}

		@@ -929,7 +934,7 @@ void ipa_qmi_service_exit(void)

		/* clean the QMI msg cache */
		if (ipa_qmi_ctx != NULL) {
		kfree(ipa_qmi_ctx);
		vfree(ipa_qmi_ctx);
		ipa_qmi_ctx = NULL;
		}
		ipa_svc_handle = 0;