Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 093c088e authored by Channagoud Kadabi's avatar Channagoud Kadabi Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qdsp6v2: fix compilation warning" into msm-4.8

parents a0badd73 997a1fff

drivers/soc/qcom/qdsp6v2/msm_audio_ion.c

+4 −4
Original line number Diff line number Diff line
@@ -321,11 +321,11 @@ int msm_audio_ion_mmap(struct audio_buffer *ab, 
				offset = 0;

			}

			len = min(len, remainder);

			pr_debug("vma=%pK, addr=%x len=%ld vm_start=%x vm_end=%x vm_page_prot=%ld\n",

			pr_debug("vma=%pK, addr=%x len=%ld vm_start=%x vm_end=%x vm_page_prot=%lu\n",

				vma, (unsigned int)addr, len,

				(unsigned int)vma->vm_start,

				(unsigned int)vma->vm_end,

				(unsigned long int)vma->vm_page_prot);

				(unsigned long)vma->vm_page_prot.pgprot);

			remap_pfn_range(vma, addr, page_to_pfn(page), len,

					vma->vm_page_prot);

			addr += len;
@@ -345,10 +345,10 @@ int msm_audio_ion_mmap(struct audio_buffer *ab, 
			return ret;

		}

		pr_debug("phys=%pKK len=%zd\n", &phys_addr, phys_len);

		pr_debug("vma=%pK, vm_start=%x vm_end=%x vm_pgoff=%ld vm_page_prot=%ld\n",

		pr_debug("vma=%pK, vm_start=%x vm_end=%x vm_pgoff=%ld vm_page_prot=%lu\n",

			vma, (unsigned int)vma->vm_start,

			(unsigned int)vma->vm_end, vma->vm_pgoff,

			(unsigned long int)vma->vm_page_prot);

			(unsigned long)vma->vm_page_prot.pgprot);

		va_len = vma->vm_end - vma->vm_start;

		if ((offset > phys_len) || (va_len > phys_len-offset)) {

			pr_err("wrong offset size %ld, lens= %zd, va_len=%zd\n",