2 files changed, 9 insertions, 2 deletions

diff --git a/include/sound/minors.h b/include/sound/minors.h
index 46bcd2023ed8..a81798ab73ed 100644
--- a/include/sound/minors.h
+++ b/include/sound/minors.h
@@ -21,6 +21,8 @@
  *
  */
 
+#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 51d58ccda2d8..5dd8ea4a8c4b 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -25,6 +25,7 @@
 
 #include <sound/asound.h>
 #include <sound/memalloc.h>
+#include <sound/minors.h>
 #include <linux/poll.h>
 #include <linux/mm.h>
 #include <linux/bitops.h>
@@ -84,7 +85,11 @@ struct snd_pcm_ops {
  *
  */
 
-#define SNDRV_PCM_DEVICES               8
+#if defined(CONFIG_SND_DYNAMIC_MINORS)
+#define SNDRV_PCM_DEVICES       (SNDRV_OS_MINORS-2)
+#else
+#define SNDRV_PCM_DEVICES       8
+#endif
 
 #define SNDRV_PCM_IOCTL1_FALSE          ((void *)0)
 #define SNDRV_PCM_IOCTL1_TRUE           ((void *)1)
@@ -416,7 +421,7 @@ struct snd_pcm_str {
 struct snd_pcm {
         struct snd_card *card;
         struct list_head list;
-        unsigned int device;    /* device number */
+        int device; /* device number */
         unsigned int info_flags;
         unsigned short dev_class;
         unsigned short dev_subclass;