aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/sound/pcm/sound.c2
-rw-r--r--sys/dev/sound/pcm/sound.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index cb510d526fa8..60236eb4c69c 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -467,7 +467,7 @@ pcm_unregister(device_t dev)
d = device_get_softc(dev);
- if (!PCM_ALIVE(d)) {
+ if (!PCM_REGISTERED(d)) {
device_printf(dev, "unregister: device not configured\n");
return (0);
}
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 8542a96ccb14..c03ac2c8ee58 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -133,8 +133,8 @@ struct snd_mixer;
"\015PVCHANS" \
"\016RVCHANS"
-#define PCM_ALIVE(x) ((x) != NULL && (x)->lock != NULL)
-#define PCM_REGISTERED(x) (PCM_ALIVE(x) && ((x)->flags & SD_F_REGISTERED))
+#define PCM_REGISTERED(x) \
+ ((x) != NULL && (x)->lock != NULL && ((x)->flags & SD_F_REGISTERED))
#define PCM_MAXCHANS 10000
#define PCM_CHANCOUNT(d) \