summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2008-08-01 13:36:04 +0200
committerJaroslav Kysela <perex@perex.cz>2008-08-01 13:36:04 +0200
commit896e6cc20e67038af12e1a7711eef32647e62f23 (patch)
tree54fc5c48570c75aa2f0a5bbecf0d159006c69638 /include/sound
parent687fbc3fece34e7e1c2ac529348ad897095a0bde (diff)
downloadlinux-896e6cc20e67038af12e1a7711eef32647e62f23.tar.bz2
sound: Revert "ALSA: Fix limit of 8 PCM devices in SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE"
This reverts commit fb3d6f2b77bdec75d45aa9d4464287ed87927866. New, updated patch with same subject replaces this commit. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/minors.h2
-rw-r--r--include/sound/pcm.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/minors.h b/include/sound/minors.h
index a81798ab73ed..46bcd2023ed8 100644
--- a/include/sound/minors.h
+++ b/include/sound/minors.h
@@ -21,8 +21,6 @@
*
*/
-#define SNDRV_OS_MINORS 256
-
#define SNDRV_MINOR_DEVICES 32
#define SNDRV_MINOR_CARD(minor) ((minor) >> 5)
#define SNDRV_MINOR_DEVICE(minor) ((minor) & 0x001f)
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index bfc096ac82e5..51d58ccda2d8 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -84,6 +84,8 @@ struct snd_pcm_ops {
*
*/
+#define SNDRV_PCM_DEVICES 8
+
#define SNDRV_PCM_IOCTL1_FALSE ((void *)0)
#define SNDRV_PCM_IOCTL1_TRUE ((void *)1)
@@ -414,7 +416,7 @@ struct snd_pcm_str {
struct snd_pcm {
struct snd_card *card;
struct list_head list;
- int device; /* device number */
+ unsigned int device; /* device number */
unsigned int info_flags;
unsigned short dev_class;
unsigned short dev_subclass;