Changeset 772 for GPL/trunk/alsa-kernel/pci/es1938.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/es1938.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/es1938.c

@@ -828 +828 @@
 static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,
                                    int channel, unsigned long pos,
-                                   void __user *dst, unsigned long count)
+#ifndef TARGET_OS2
+                                   struct iov_iter *dst, unsigned long count)
+#else
+                                   void *dst, unsigned long count)
+#endif
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
@@ -835 +839 @@
         if (snd_BUG_ON(pos + count > chip->dma1_size))
                 return -EINVAL;
+#ifndef TARGET_OS2
+        if (pos + count < chip->dma1_size) {
+                if (copy_to_iter(runtime->dma_area + pos + 1, count, dst) != count)
+                        return -EFAULT;
+        } else {
+                if (copy_to_iter(runtime->dma_area + pos + 1, count - 1, dst) != count - 1)
+                        return -EFAULT;
+                if (copy_to_iter(runtime->dma_area, 1, dst) != 1)
+                        return -EFAULT;
+        }
+#else
         if (pos + count < chip->dma1_size) {
                 if (copy_to_user(dst, runtime->dma_area + pos + 1, count))
@@ -845 +860 @@
                         return -EFAULT;
         }
-        return 0;
-}
-
-static int snd_es1938_capture_copy_kernel(struct snd_pcm_substream *substream,
-                                          int channel, unsigned long pos,
-                                          void *dst, unsigned long count)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct es1938 *chip = snd_pcm_substream_chip(substream);
-
-        if (snd_BUG_ON(pos + count > chip->dma1_size))
-                return -EINVAL;
-        if (pos + count < chip->dma1_size) {
-                memcpy(dst, runtime->dma_area + pos + 1, count);
-        } else {
-                memcpy(dst, runtime->dma_area + pos + 1, count - 1);
-                runtime->dma_area[0] = *((unsigned char *)dst + count - 1);
-        }
+#endif
         return 0;
 }
@@ -991 +989 @@
         .trigger =      snd_es1938_capture_trigger,
         .pointer =      snd_es1938_capture_pointer,
-        .copy_user =    snd_es1938_capture_copy,
-        .copy_kernel =  snd_es1938_capture_copy_kernel,
+        .copy =         snd_es1938_capture_copy,
 };