commit 1fbda9905f28411f7d3f05d3fbaaff51d021bcce
author Linux Build Service Account <lnxbuild@localhost> Tue May 15 21:33:19 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue May 15 21:33:19 2012 -0700
tree 7967898d4ea6849bd7b0196b39b48677ba9e7e53
parent d0f59cd73ea3b9de9fd1eb7ff84612015b6700ce
parent d77287be02473b9e93711c3878ecfeef3c4d031e

Merge "msm: camera: Make memory allocation atomic in vfe irq handler" into msm-3.0

drivers/media/video/msm/msm_vfe7x27a_v4l2.c

diff --git a/drivers/media/video/msm/msm_vfe7x27a_v4l2.c b/drivers/media/video/msm/msm_vfe7x27a_v4l2.c
index d9d315e..dd567d1 100644
--- a/drivers/media/video/msm/msm_vfe7x27a_v4l2.c
+++ b/drivers/media/video/msm/msm_vfe7x27a_v4l2.c
@@ -409,7 +409,7 @@
 
 	CDBG("%s:id=%d\n", __func__, id);
 	if (id != VFE_ADSP_EVENT) {
-		data = kzalloc(len, GFP_KERNEL);
+		data = kzalloc(len, GFP_ATOMIC);
 		if (!data) {
 			pr_err("%s: rp: cannot allocate buffer\n", __func__);
 			return;