ALSA: Fix limit of 8 PCM devices in SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE

When compiled with CONFIG_SND_DYNAMIC_MINORS the ALSA core is fine
to have more than 8 PCM devices per card, except one place - the
SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE ioctl, which will not enumerate
devices > 7. This patch fixes the issue, changing the devices list
organisation.

Instead of adding new device to the tail, the list is now kept always
ordered (by card number, then device number). Thus, during enumeration,
it is easy to discover the fact that there is no more given card's
devices. The same limit was present in OSS emulation code. It has
been fixed as well.

Additionally the device field of struct snd_pcm is now int, instead of
unsigned int, as there is no obvious reason for keeping it unsigned.
This caused a lot of problems with comparing this value with other
(almost always signed) variables. There is just one more place where
device number is unsigned - in struct snd_pcm_info, which should be
also sorted out in future.

Signed-off-by: Pawel MOLL <pawel.moll@st.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 4c601b192dd..4ccd761a5f4 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2947,7 +2947,7 @@ static void register_oss_dsp(struct snd_pcm *pcm, int index)
 static int snd_pcm_oss_register_minor(struct snd_pcm *pcm)
 {
         pcm->oss.reg = 0;
-        if (dsp_map[pcm->card->number] == (int)pcm->device) {
+        if (dsp_map[pcm->card->number] == pcm->device) {
                 char name[128];
                 int duplex;
                 register_oss_dsp(pcm, 0);
@@ -2963,7 +2963,7 @@ static int snd_pcm_oss_register_minor(struct snd_pcm *pcm)
                 pcm->oss.reg++;
                 pcm->oss.reg_mask |= 1;
         }
-        if (adsp_map[pcm->card->number] == (int)pcm->device) {
+        if (adsp_map[pcm->card->number] == pcm->device) {
                 register_oss_dsp(pcm, 1);
                 pcm->oss.reg++;
                 pcm->oss.reg_mask |= 2;
@@ -2988,7 +2988,7 @@ static int snd_pcm_oss_disconnect_minor(struct snd_pcm *pcm)
                         snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
                                                   pcm->card, 1);
                 }
-                if (dsp_map[pcm->card->number] == (int)pcm->device) {
+                if (dsp_map[pcm->card->number] == pcm->device) {
 #ifdef SNDRV_OSS_INFO_DEV_AUDIO
                         snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_AUDIO, pcm->card->number);
 #endif
@@ -3019,12 +3019,12 @@ static int __init alsa_pcm_oss_init(void)
 
         /* check device map table */
         for (i = 0; i < SNDRV_CARDS; i++) {
-                if (dsp_map[i] < 0 || dsp_map[i] >= SNDRV_PCM_DEVICES) {
+                if (dsp_map[i] < 0 || dsp_map[i] >= SNDRV_OS_MINORS) {
                         snd_printk(KERN_ERR "invalid dsp_map[%d] = %d\n",
                                    i, dsp_map[i]);
                         dsp_map[i] = 0;
                 }
-                if (adsp_map[i] < 0 || adsp_map[i] >= SNDRV_PCM_DEVICES) {
+                if (adsp_map[i] < 0 || adsp_map[i] >= SNDRV_OS_MINORS) {
                         snd_printk(KERN_ERR "invalid adsp_map[%d] = %d\n",
                                    i, adsp_map[i]);
                         adsp_map[i] = 1;