X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-core%2Frecipes-kernel%2Fmost%2Ffiles%2F0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch;h=d4383c4f65c463873cf6549e36201e00d00a6b13;hb=b8a8fef1cb9914b9e11a50da8296af9b3316adb3;hp=8f83dbab42b62d6c60681b3e46c686ccaf5c5b5c;hpb=7faccb97d69c7581e338f88ce3a2153cdd69fd16;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch b/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch
index 8f83dbab4..d4383c4f6 100644
--- a/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch
+++ b/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch
@@ -1,18 +1,30 @@
 Handle snd_pcm_lib_mmap_vmalloc removal in 4.19
 
-Upstream-Status: Pending
+Add .mmap field back to pcm_ops for kernels older than 4.19.
+
+Upstream-Status: Inappropriate
 
 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
 
-diff --git a/driver/aim-sound/sound.c b/driver/aim-sound/sound.c
-index 6a290ff..4b3329b 100644
+diff --git a/aim-sound/sound.c b/aim-sound/sound.c
+index 4b3329b..c0a26be 100644
 --- a/aim-sound/sound.c
 +++ b/aim-sound/sound.c
-@@ -463,7 +463,6 @@ static const struct snd_pcm_ops pcm_ops = {
+@@ -17,6 +17,7 @@
+ #include <linux/printk.h>
+ #include <linux/kernel.h>
+ #include <linux/init.h>
++#include <linux/version.h>
+ #include <sound/core.h>
+ #include <sound/pcm.h>
+ #include <sound/pcm_params.h>
+@@ -463,6 +464,9 @@ static const struct snd_pcm_ops pcm_ops = {
  	.trigger    = pcm_trigger,
  	.pointer    = pcm_pointer,
  	.page       = snd_pcm_lib_get_vmalloc_page,
--	.mmap       = snd_pcm_lib_mmap_vmalloc,
++#if LINUX_VERSION_CODE <  KERNEL_VERSION(4,19,0)
++	.mmap       = snd_pcm_lib_mmap_vmalloc,
++#endif
  };
  
  static int split_arg_list(char *buf, char **card_name, u16 *ch_num,