From 6188116a5d07c0e82fdce27f6e94ba28ce43ca56 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 19 Nov 2012 18:36:09 -0300 Subject: [PATCH] --- yaml --- r: 356972 b: refs/heads/master c: 4a8a8042be289f6d53fc6cbfbed1722db14d7af1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/soc_camera/mx2_camera.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf897300bc7a..2e806d472775 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc1ebd704751bb6b86612e63fdfac56918364d07 +refs/heads/master: 4a8a8042be289f6d53fc6cbfbed1722db14d7af1 diff --git a/trunk/drivers/media/platform/soc_camera/mx2_camera.c b/trunk/drivers/media/platform/soc_camera/mx2_camera.c index 9a55f4c4c7f4..77529f860386 100644 --- a/trunk/drivers/media/platform/soc_camera/mx2_camera.c +++ b/trunk/drivers/media/platform/soc_camera/mx2_camera.c @@ -879,7 +879,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count) pcdev->discard_size = icd->user_height * bytesperline; pcdev->discard_buffer = dma_alloc_coherent(ici->v4l2_dev.dev, pcdev->discard_size, &pcdev->discard_buffer_dma, - GFP_KERNEL); + GFP_ATOMIC); if (!pcdev->discard_buffer) { spin_unlock_irqrestore(&pcdev->lock, flags); return -ENOMEM;