diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-02-22 15:41:54 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-03 19:13:12 +0200 |
commit | 9480c7b4eb3f7da3989593cf65741a610f8655e0 (patch) | |
tree | 894b3746a4b90bc36afc62c71f3b0faeba1f4c09 /patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch | |
parent | 80c0be55338fe55327ec8955bf4fd2cc42895173 (diff) |
patches: refresh patches on next-20150222
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.68 [ OK ]
4 3.3.8 [ OK ]
5 3.4.106 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.73 [ OK ]
12 3.11.10 [ OK ]
13 3.12.39 [ OK ]
14 3.13.11 [ OK ]
15 3.14.37 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.10 [ OK ]
20 3.19.3 [ OK ]
21 4.0-rc6 [ OK ]
manual changes done to:
patches/collateral-evolutions/network/0020-tty-termios/drivers_bluetooth_hci_ath.patch
- removed
patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
- handled added CONFIG_HAS_DMA
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch')
-rw-r--r-- | patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch index bdb2ff39..2b5dbf66 100644 --- a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch +++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch @@ -1,6 +1,6 @@ --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c -@@ -564,7 +564,9 @@ static void vb2_dc_put_userptr(void *buf +@@ -570,7 +570,9 @@ static void vb2_dc_put_userptr(void *buf if (sgt) { DEFINE_DMA_ATTRS(attrs); @@ -10,7 +10,7 @@ /* * No need to sync to CPU, it's already synced to the CPU * since the finish() memop will have been called before this. -@@ -629,7 +631,9 @@ static void *vb2_dc_get_userptr(void *al +@@ -635,7 +637,9 @@ static void *vb2_dc_get_userptr(void *al unsigned long dma_align = dma_get_cache_alignment(); DEFINE_DMA_ATTRS(attrs); |