summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorCyril Roelandt <tipecaml@gmail.com>2012-11-19 18:36:09 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-04 15:03:59 -0200
commit4a8a8042be289f6d53fc6cbfbed1722db14d7af1 (patch)
treef50ff50f67c128168a9eedbdfeed5e125acf55c0 /drivers
parentbc1ebd704751bb6b86612e63fdfac56918364d07 (diff)
[media] mx2_camera: use GFP_ATOMIC under spin lock
Found using the following semantic patch: <spml> @@ @@ spin_lock_irqsave(...); ... when != spin_unlock_irqrestore(...); * GFP_KERNEL </spml> Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/soc_camera/mx2_camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 9a55f4c4c7f4..77529f860386 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/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;