diff options
author | Jaroslav Kysela <perex@perex.cz> | 2008-08-01 07:36:04 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-01 07:36:04 -0400 |
commit | 896e6cc20e67038af12e1a7711eef32647e62f23 (patch) | |
tree | 54fc5c48570c75aa2f0a5bbecf0d159006c69638 /include | |
parent | 687fbc3fece34e7e1c2ac529348ad897095a0bde (diff) |
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')
-rw-r--r-- | include/sound/minors.h | 2 | ||||
-rw-r--r-- | include/sound/pcm.h | 4 |
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 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define SNDRV_OS_MINORS 256 | ||
25 | |||
26 | #define SNDRV_MINOR_DEVICES 32 | 24 | #define SNDRV_MINOR_DEVICES 32 |
27 | #define SNDRV_MINOR_CARD(minor) ((minor) >> 5) | 25 | #define SNDRV_MINOR_CARD(minor) ((minor) >> 5) |
28 | #define SNDRV_MINOR_DEVICE(minor) ((minor) & 0x001f) | 26 | #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 { | |||
84 | * | 84 | * |
85 | */ | 85 | */ |
86 | 86 | ||
87 | #define SNDRV_PCM_DEVICES 8 | ||
88 | |||
87 | #define SNDRV_PCM_IOCTL1_FALSE ((void *)0) | 89 | #define SNDRV_PCM_IOCTL1_FALSE ((void *)0) |
88 | #define SNDRV_PCM_IOCTL1_TRUE ((void *)1) | 90 | #define SNDRV_PCM_IOCTL1_TRUE ((void *)1) |
89 | 91 | ||
@@ -414,7 +416,7 @@ struct snd_pcm_str { | |||
414 | struct snd_pcm { | 416 | struct snd_pcm { |
415 | struct snd_card *card; | 417 | struct snd_card *card; |
416 | struct list_head list; | 418 | struct list_head list; |
417 | int device; /* device number */ | 419 | unsigned int device; /* device number */ |
418 | unsigned int info_flags; | 420 | unsigned int info_flags; |
419 | unsigned short dev_class; | 421 | unsigned short dev_class; |
420 | unsigned short dev_subclass; | 422 | unsigned short dev_subclass; |