Changeset 772 for GPL/trunk/alsa-kernel/include/sound/pcm-indirect.h

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/include/sound/pcm-indirect.h (modified) (6 diffs)

GPL/trunk/alsa-kernel/include/sound/pcm-indirect.h

@@ -45 +45 @@
                         diff += runtime->boundary;
                 if (diff < 0)
-                        return -EINVAL;
+                        return -EPIPE;
                 rec->sw_ready += (int)frames_to_bytes(runtime, diff);
                 rec->appl_ptr = appl_ptr;
@@ -84 +84 @@
 {
         int bytes = ptr - rec->hw_io;
+        int err;
+
         if (bytes < 0)
                 bytes += rec->hw_buffer_size;
@@ -91 +93 @@
         if (rec->sw_io >= rec->sw_buffer_size)
                 rec->sw_io -= rec->sw_buffer_size;
-        if (substream->ops->ack)
-                substream->ops->ack(substream);
+        if (substream->ops->ack) {
+                err = substream->ops->ack(substream);
+                if (err == -EPIPE)
+                        return SNDRV_PCM_POS_XRUN;
+        }
         return bytes_to_frames(substream->runtime, rec->sw_io);
 }
@@ -113 +118 @@
                         diff += runtime->boundary;
                 if (diff < 0)
-                        return -EINVAL;
+                        return -EPIPE;
                 rec->sw_ready -= frames_to_bytes(runtime, diff);
                 rec->appl_ptr = appl_ptr;
@@ -153 +158 @@
         int qsize;
         int bytes = ptr - rec->hw_io;
+        int err;
+
         if (bytes < 0)
                 bytes += rec->hw_buffer_size;
@@ -163 +170 @@
         if (rec->sw_io >= rec->sw_buffer_size)
                 rec->sw_io -= rec->sw_buffer_size;
-        if (substream->ops->ack)
-                substream->ops->ack(substream);
+        if (substream->ops->ack) {
+                err = substream->ops->ack(substream);
+                if (err == -EPIPE)
+                        return SNDRV_PCM_POS_XRUN;
+        }
         return bytes_to_frames(substream->runtime, rec->sw_io);
 }