diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-13 16:40:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-13 16:40:01 +1100 |
| commit | be9414f2ff2406778cb5a55466822c5594df90bf (patch) | |
| tree | d86264aafc5d3a598b56985f2b04303ee402f109 /drivers/media/pci/solo6x10/solo6x10-v4l2.c | |
| parent | b3d8dd33d9c63535d162d828fdce9c045cd8ed88 (diff) | |
| parent | c3a0c7301db7c3797655cf114e67f4162830c370 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'drivers/media/pci/solo6x10/solo6x10-v4l2.c')
| -rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c index 63ae8a61f603..bde77b22340c 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c @@ -675,7 +675,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr) solo_dev->vidq.mem_ops = &vb2_dma_contig_memops; solo_dev->vidq.drv_priv = solo_dev; solo_dev->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - solo_dev->vidq.gfp_flags = __GFP_DMA32; + solo_dev->vidq.gfp_flags = __GFP_DMA32 | __GFP_KSWAPD_RECLAIM; solo_dev->vidq.buf_struct_size = sizeof(struct solo_vb2_buf); solo_dev->vidq.lock = &solo_dev->lock; ret = vb2_queue_init(&solo_dev->vidq); |