Page MenuHomeFreeBSD
Files F106961348

D48249.diff
No OneTemporary
Actions

D48249.diff
View Options

diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -189,9 +189,6 @@
#define CHN_INSERT_AFTER(x, y, z) \
SLIST_INSERT_AFTER(x, y, CHN_LINK(z))
-#define CHN_REMOVE(holder, elm, list) \
- SLIST_REMOVE(CHN_HEAD(holder, list), elm, pcm_channel, CHN_LINK(list))
-
#define CHN_INSERT_HEAD_SAFE(x, y, z) do { \
struct pcm_channel *t = NULL; \
CHN_FOREACH(t, x, z) { \
@@ -212,7 +209,7 @@
CHN_INSERT_AFTER(x, y, z); \
} while (0)
-#define CHN_REMOVE_SAFE(holder, elm, list) do { \
+#define CHN_REMOVE(holder, elm, list) do { \
if (CHN_FIRST(holder, list) == (elm)) { \
SLIST_REMOVE_HEAD(CHN_HEAD(holder, list), CHN_LINK(list)); \
} else { \
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -2291,7 +2291,7 @@
break;
case PCMTRIG_STOP:
case PCMTRIG_ABORT:
- CHN_REMOVE_SAFE(d, c, channels.pcm.busy);
+ CHN_REMOVE(d, c, channels.pcm.busy);
PCM_UNLOCK(d);
break;
default:

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 9, 3:26 AM (6 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15637889
Default Alt Text
D48249.diff (1 KB)

Event Timeline