1 files changed, 56 insertions, 28 deletions

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index ece25c718e95..192a433a2403 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -42,7 +42,7 @@ static int snd_pcm_dev_free(struct snd_device *device);
 static int snd_pcm_dev_register(struct snd_device *device);
 static int snd_pcm_dev_disconnect(struct snd_device *device);
 
-static struct snd_pcm *snd_pcm_search(struct snd_card *card, int device)
+static struct snd_pcm *snd_pcm_get(struct snd_card *card, int device)
 {
         struct snd_pcm *pcm;
 
@@ -53,6 +53,37 @@ static struct snd_pcm *snd_pcm_search(struct snd_card *card, int device)
         return NULL;
 }
 
+static int snd_pcm_next(struct snd_card *card, int device)
+{
+        struct snd_pcm *pcm;
+
+        list_for_each_entry(pcm, &snd_pcm_devices, list) {
+                if (pcm->card == card && pcm->device > device)
+                        return pcm->device;
+                else if (pcm->card->number > card->number)
+                        return -1;
+        }
+        return -1;
+}
+
+static int snd_pcm_add(struct snd_pcm *newpcm)
+{
+        struct snd_pcm *pcm;
+
+        list_for_each_entry(pcm, &snd_pcm_devices, list) {
+                if (pcm->card == newpcm->card && pcm->device == newpcm->device)
+                        return -EBUSY;
+                if (pcm->card->number > newpcm->card->number ||
+                                (pcm->card == newpcm->card &&
+                                pcm->device > newpcm->device)) {
+                        list_add(&newpcm->list, pcm->list.prev);
+                        return 0;
+                }
+        }
+        list_add_tail(&newpcm->list, &snd_pcm_devices);
+        return 0;
+}
+
 static int snd_pcm_control_ioctl(struct snd_card *card,
                                  struct snd_ctl_file *control,
                                  unsigned int cmd, unsigned long arg)
@@ -65,14 +96,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card,
                         if (get_user(device, (int __user *)arg))
                                 return -EFAULT;
                         mutex_lock(&register_mutex);
-                        device = device < 0 ? 0 : device + 1;
-                        while (device < SNDRV_PCM_DEVICES) {
-                                if (snd_pcm_search(card, device))
-                                        break;
-                                device++;
-                        }
-                        if (device == SNDRV_PCM_DEVICES)
-                                device = -1;
+                        device = snd_pcm_next(card, device);
                         mutex_unlock(&register_mutex);
                         if (put_user(device, (int __user *)arg))
                                 return -EFAULT;
@@ -98,7 +122,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card,
                         if (get_user(subdevice, &info->subdevice))
                                 return -EFAULT;
                         mutex_lock(&register_mutex);
-                        pcm = snd_pcm_search(card, device);
+                        pcm = snd_pcm_get(card, device);
                         if (pcm == NULL) {
                                 err = -ENXIO;
                                 goto _error;
@@ -232,7 +256,6 @@ static char *snd_pcm_tstamp_mode_names[] = {
 
 static const char *snd_pcm_stream_name(int stream)
 {
-        snd_assert(stream <= SNDRV_PCM_STREAM_LAST, return NULL);
         return snd_pcm_stream_names[stream];
 }
 
@@ -248,7 +271,6 @@ static const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat)
 
 static const char *snd_pcm_tstamp_mode_name(int mode)
 {
-        snd_assert(mode <= SNDRV_PCM_TSTAMP_LAST, return NULL);
         return snd_pcm_tstamp_mode_names[mode];
 }
 
@@ -682,9 +704,10 @@ int snd_pcm_new(struct snd_card *card, char *id, int device,
                 .dev_disconnect = snd_pcm_dev_disconnect,
         };
 
-        snd_assert(rpcm != NULL, return -EINVAL);
-        *rpcm = NULL;
-        snd_assert(card != NULL, return -ENXIO);
+        if (snd_BUG_ON(!card))
+                return -ENXIO;
+        if (rpcm)
+                *rpcm = NULL;
         pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);
         if (pcm == NULL) {
                 snd_printk(KERN_ERR "Cannot allocate PCM\n");
@@ -708,7 +731,8 @@ int snd_pcm_new(struct snd_card *card, char *id, int device,
                 snd_pcm_free(pcm);
                 return err;
         }
-        *rpcm = pcm;
+        if (rpcm)
+                *rpcm = pcm;
         return 0;
 }
 
@@ -742,7 +766,8 @@ static int snd_pcm_free(struct snd_pcm *pcm)
 {
         struct snd_pcm_notify *notify;
 
-        snd_assert(pcm != NULL, return -ENXIO);
+        if (!pcm)
+                return 0;
         list_for_each_entry(notify, &snd_pcm_notify_list, list) {
                 notify->n_unregister(pcm);
         }
@@ -773,9 +798,9 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,
         int prefer_subdevice = -1;
         size_t size;
 
-        snd_assert(rsubstream != NULL, return -EINVAL);
+        if (snd_BUG_ON(!pcm || !rsubstream))
+                return -ENXIO;
         *rsubstream = NULL;
-        snd_assert(pcm != NULL, return -ENXIO);
         pstr = &pcm->streams[stream];
         if (pstr->substream == NULL || pstr->substream_count == 0)
                 return -ENODEV;
@@ -883,8 +908,9 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime;
 
+        if (PCM_RUNTIME_CHECK(substream))
+                return;
         runtime = substream->runtime;
-        snd_assert(runtime != NULL, return);
         if (runtime->private_free != NULL)
                 runtime->private_free(runtime);
         snd_free_pages((void*)runtime->status,
@@ -929,13 +955,14 @@ static int snd_pcm_dev_register(struct snd_device *device)
         struct snd_pcm *pcm = device->device_data;
         struct device *dev;
 
-        snd_assert(pcm != NULL && device != NULL, return -ENXIO);
+        if (snd_BUG_ON(!pcm || !device))
+                return -ENXIO;
         mutex_lock(&register_mutex);
-        if (snd_pcm_search(pcm->card, pcm->device)) {
+        err = snd_pcm_add(pcm);
+        if (err) {
                 mutex_unlock(&register_mutex);
-                return -EBUSY;
+                return err;
         }
-        list_add_tail(&pcm->list, &snd_pcm_devices);
         for (cidx = 0; cidx < 2; cidx++) {
                 int devtype = -1;
                 if (pcm->streams[cidx].substream == NULL)
@@ -1019,10 +1046,11 @@ int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree)
 {
         struct snd_pcm *pcm;
 
-        snd_assert(notify != NULL &&
-                   notify->n_register != NULL &&
-                   notify->n_unregister != NULL &&
-                   notify->n_disconnect, return -EINVAL);
+        if (snd_BUG_ON(!notify ||
+                       !notify->n_register ||
+                       !notify->n_unregister ||
+                       !notify->n_disconnect))
+                return -EINVAL;
         mutex_lock(&register_mutex);
         if (nfree) {
                 list_del(&notify->list);