From 3c601ab29e161c8ef23f4a1bf2211de7ca29b37a Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 1 Jun 2011 12:57:37 -0300 Subject: [PATCH] --- yaml --- r: 254629 b: refs/heads/master c: a52a82fc3a397261ecbcbd441498be58997379c8 h: refs/heads/master i: 254627: 325a063830310d23c905b39a7a633695b6fa5e33 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-dma-sg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index da2017b72ff1..6d6767b21421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a7b2d1f0eb0a6b674726c9a9d77ce83fd0b27fe +refs/heads/master: a52a82fc3a397261ecbcbd441498be58997379c8 diff --git a/trunk/drivers/media/video/videobuf2-dma-sg.c b/trunk/drivers/media/video/videobuf2-dma-sg.c index b2d9485aac75..10a20d9509d9 100644 --- a/trunk/drivers/media/video/videobuf2-dma-sg.c +++ b/trunk/drivers/media/video/videobuf2-dma-sg.c @@ -62,7 +62,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size) goto fail_pages_array_alloc; for (i = 0; i < buf->sg_desc.num_pages; ++i) { - buf->pages[i] = alloc_page(GFP_KERNEL | __GFP_ZERO); + buf->pages[i] = alloc_page(GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN); if (NULL == buf->pages[i]) goto fail_pages_alloc; sg_set_page(&buf->sg_desc.sglist[i],