Merge "ASoC: msm: qdsp6v2: update int to size_t" (6e6480ff) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/q6asm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1066,7 +1066,7 @@ int q6asm_audio_client_buf_alloc(unsigned int dir,
		int cnt = 0;
		int rc = 0;
		struct audio_buffer *buf;
		int len;
		size_t len;

		if (!(ac) \|\| ((dir != IN) && (dir != OUT))) {
		pr_err("%s: ac %p dir %d\n", __func__, ac, dir);
		@@ -1105,7 +1105,7 @@ int q6asm_audio_client_buf_alloc(unsigned int dir,
		&buf[cnt].client, &buf[cnt].handle,
		bufsz,
		(ion_phys_addr_t *)&buf[cnt].phys,
		(size_t *)&len,
		&len,
		&buf[cnt].data);
		if (rc) {
		pr_err("%s: ION Get Physical for AUDIO failed, rc = %d\n",
		@@ -1150,7 +1150,7 @@ int q6asm_audio_client_buf_alloc_contiguous(unsigned int dir,
		int cnt = 0;
		int rc = 0;
		struct audio_buffer *buf;
		int len;
		size_t len;
		int bytes_to_alloc;

		if (!(ac) \|\| ((dir != IN) && (dir != OUT))) {
		@@ -1191,7 +1191,7 @@ int q6asm_audio_client_buf_alloc_contiguous(unsigned int dir,

		rc = msm_audio_ion_alloc("asm_client", &buf[0].client, &buf[0].handle,
		bytes_to_alloc,
		(ion_phys_addr_t )&buf[0].phys, (size_t )&len,
		(ion_phys_addr_t *)&buf[0].phys, &len,
		&buf[0].data);
		if (rc) {
		pr_err("%s: Audio ION alloc is failed, rc = %d\n",