7 files changed, 98 insertions, 97 deletions

diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 41c36b055f6b..09aed2363cc9 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -336,9 +336,10 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
                 log("Unable to set up control system (ret=%d)\n", ret);
 }
 
-static struct snd_card* create_card(struct usb_device* usb_dev)
+static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
 {
         int devnum;
+        int err;
         struct snd_card *card;
         struct snd_usb_caiaqdev *dev;
 
@@ -347,12 +348,12 @@ static struct snd_card* create_card(struct usb_device* usb_dev)
                         break;
 
         if (devnum >= SNDRV_CARDS)
-                return NULL;
+                return -ENODEV;
 
-        card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, 
-                                        sizeof(struct snd_usb_caiaqdev));
-        if (!card)
-                return NULL;
+        err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, 
+                              sizeof(struct snd_usb_caiaqdev), &card);
+        if (err < 0)
+                return err;
 
         dev = caiaqdev(card);
         dev->chip.dev = usb_dev;
@@ -362,7 +363,8 @@ static struct snd_card* create_card(struct usb_device* usb_dev)
         spin_lock_init(&dev->spinlock);
         snd_card_set_dev(card, &usb_dev->dev);
 
-        return card;
+        *cardp = card;
+        return 0;
 }
 
 static int __devinit init_card(struct snd_usb_caiaqdev *dev)
@@ -441,10 +443,10 @@ static int __devinit snd_probe(struct usb_interface *intf,
         struct snd_card *card;
         struct usb_device *device = interface_to_usbdev(intf);
         
-        card = create_card(device);
+        ret = create_card(device, &card);
         
-        if (!card)
-                return -ENOMEM;
+        if (ret < 0)
+                return ret;
                         
         usb_set_intfdata(intf, card);
         ret = init_card(caiaqdev(card));
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index c709b9563226..8f3cdb37a0ec 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2524,7 +2524,6 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                  * build the rate table and bitmap flags
                  */
                 int r, idx;
-                unsigned int nonzero_rates = 0;
 
                 fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
                 if (fp->rate_table == NULL) {
@@ -2532,24 +2531,27 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                         return -1;
                 }
 
-                fp->nr_rates = nr_rates;
-                fp->rate_min = fp->rate_max = combine_triple(&fmt[8]);
+                fp->nr_rates = 0;
+                fp->rate_min = fp->rate_max = 0;
                 for (r = 0, idx = offset + 1; r < nr_rates; r++, idx += 3) {
                         unsigned int rate = combine_triple(&fmt[idx]);
+                        if (!rate)
+                                continue;
                         /* C-Media CM6501 mislabels its 96 kHz altsetting */
                         if (rate == 48000 && nr_rates == 1 &&
-                            chip->usb_id == USB_ID(0x0d8c, 0x0201) &&
+                            (chip->usb_id == USB_ID(0x0d8c, 0x0201) ||
+                             chip->usb_id == USB_ID(0x0d8c, 0x0102)) &&
                             fp->altsetting == 5 && fp->maxpacksize == 392)
                                 rate = 96000;
-                        fp->rate_table[r] = rate;
-                        nonzero_rates |= rate;
-                        if (rate < fp->rate_min)
+                        fp->rate_table[fp->nr_rates] = rate;
+                        if (!fp->rate_min || rate < fp->rate_min)
                                 fp->rate_min = rate;
-                        else if (rate > fp->rate_max)
+                        if (!fp->rate_max || rate > fp->rate_max)
                                 fp->rate_max = rate;
                         fp->rates |= snd_pcm_rate_to_rate_bit(rate);
+                        fp->nr_rates++;
                 }
-                if (!nonzero_rates) {
+                if (!fp->nr_rates) {
                         hwc_debug("All rates were zero. Skipping format!\n");
                         return -1;
                 }
@@ -2966,6 +2968,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
                 return -EINVAL;
         }
         alts = &iface->altsetting[fp->altset_idx];
+        fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
         usb_set_interface(chip->dev, fp->iface, 0);
         init_usb_pitch(chip->dev, fp->iface, alts, fp);
         init_usb_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max);
@@ -3463,10 +3466,10 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                 return -ENXIO;
         }
 
-        card = snd_card_new(index[idx], id[idx], THIS_MODULE, 0);
-        if (card == NULL) {
+        err = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card);
+        if (err < 0) {
                 snd_printk(KERN_ERR "cannot create card instance %d\n", idx);
-                return -ENOMEM;
+                return err;
         }
 
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 320641ab5be7..26bad373fe65 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1625,6 +1625,7 @@ static int snd_usbmidi_create_endpoints_midiman(struct snd_usb_midi* umidi,
         }
 
         ep_info.out_ep = get_endpoint(hostif, 2)->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+        ep_info.out_interval = 0;
         ep_info.out_cables = endpoint->out_cables & 0x5555;
         err = snd_usbmidi_out_endpoint_create(umidi, &ep_info, &umidi->endpoints[0]);
         if (err < 0)
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 00397c8a765b..2bde79216fa5 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -78,7 +78,6 @@ struct usb_mixer_interface {
 
         /* Sound Blaster remote control stuff */
         const struct rc_config *rc_cfg;
-        unsigned long rc_hwdep_open;
         u32 rc_code;
         wait_queue_head_t rc_waitq;
         struct urb *rc_urb;
@@ -1797,24 +1796,6 @@ static void snd_usb_soundblaster_remote_complete(struct urb *urb)
         wake_up(&mixer->rc_waitq);
 }
 
-static int snd_usb_sbrc_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        struct usb_mixer_interface *mixer = hw->private_data;
-
-        if (test_and_set_bit(0, &mixer->rc_hwdep_open))
-                return -EBUSY;
-        return 0;
-}
-
-static int snd_usb_sbrc_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        struct usb_mixer_interface *mixer = hw->private_data;
-
-        clear_bit(0, &mixer->rc_hwdep_open);
-        smp_mb__after_clear_bit();
-        return 0;
-}
-
 static long snd_usb_sbrc_hwdep_read(struct snd_hwdep *hw, char __user *buf,
                                      long count, loff_t *offset)
 {
@@ -1867,9 +1848,8 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
         hwdep->iface = SNDRV_HWDEP_IFACE_SB_RC;
         hwdep->private_data = mixer;
         hwdep->ops.read = snd_usb_sbrc_hwdep_read;
-        hwdep->ops.open = snd_usb_sbrc_hwdep_open;
-        hwdep->ops.release = snd_usb_sbrc_hwdep_release;
         hwdep->ops.poll = snd_usb_sbrc_hwdep_poll;
+        hwdep->exclusive = 1;
 
         mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!mixer->rc_urb)
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index 73e59f4403a4..98276aafefe6 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -478,19 +478,21 @@ static bool us122l_create_card(struct snd_card *card)
         return true;
 }
 
-static struct snd_card *usx2y_create_card(struct usb_device *device)
+static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp)
 {
         int             dev;
         struct snd_card *card;
+        int err;
+
         for (dev = 0; dev < SNDRV_CARDS; ++dev)
                 if (enable[dev] && !snd_us122l_card_used[dev])
                         break;
         if (dev >= SNDRV_CARDS)
-                return NULL;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct us122l));
-        if (!card)
-                return NULL;
+                return -ENODEV;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct us122l), &card);
+        if (err < 0)
+                return err;
         snd_us122l_card_used[US122L(card)->chip.index = dev] = 1;
 
         US122L(card)->chip.dev = device;
@@ -509,46 +511,57 @@ static struct snd_card *usx2y_create_card(struct usb_device *device)
                 US122L(card)->chip.dev->devnum
                 );
         snd_card_set_dev(card, &device->dev);
-        return card;
+        *cardp = card;
+        return 0;
 }
 
-static void *us122l_usb_probe(struct usb_interface *intf,
-                              const struct usb_device_id *device_id)
+static int us122l_usb_probe(struct usb_interface *intf,
+                            const struct usb_device_id *device_id,
+                            struct snd_card **cardp)
 {
         struct usb_device *device = interface_to_usbdev(intf);
-        struct snd_card *card = usx2y_create_card(device);
+        struct snd_card *card;
+        int err;
 
-        if (!card)
-                return NULL;
+        err = usx2y_create_card(device, &card);
+        if (err < 0)
+                return err;
 
-        if (!us122l_create_card(card) ||
-            snd_card_register(card) < 0) {
+        if (!us122l_create_card(card)) {
                 snd_card_free(card);
-                return NULL;
+                return -EINVAL;
+        }
+
+        err = snd_card_register(card);
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
         }
 
         usb_get_dev(device);
-        return card;
+        *cardp = card;
+        return 0;
 }
 
 static int snd_us122l_probe(struct usb_interface *intf,
                             const struct usb_device_id *id)
 {
         struct snd_card *card;
+        int err;
+
         snd_printdd(KERN_DEBUG"%p:%i\n",
                     intf, intf->cur_altsetting->desc.bInterfaceNumber);
         if (intf->cur_altsetting->desc.bInterfaceNumber != 1)
                 return 0;
 
-        card = us122l_usb_probe(usb_get_intf(intf), id);
-
-        if (card) {
-                usb_set_intfdata(intf, card);
-                return 0;
+        err = us122l_usb_probe(usb_get_intf(intf), id, &card);
+        if (err < 0) {
+                usb_put_intf(intf);
+                return err;
         }
 
-        usb_put_intf(intf);
-        return -EIO;
+        usb_set_intfdata(intf, card);
+        return 0;
 }
 
 static void snd_us122l_disconnect(struct usb_interface *intf)
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index fc650c800afc..4af8740db717 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -103,16 +103,6 @@ static unsigned int snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file,
 }
 
 
-static int snd_usX2Y_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
-static int snd_usX2Y_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
 static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
                                       struct snd_hwdep_dsp_status *info)
 {
@@ -264,8 +254,6 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
 
         hw->iface = SNDRV_HWDEP_IFACE_USX2Y;
         hw->private_data = usX2Y(card);
-        hw->ops.open = snd_usX2Y_hwdep_open;
-        hw->ops.release = snd_usX2Y_hwdep_release;
         hw->ops.dsp_status = snd_usX2Y_hwdep_dsp_status;
         hw->ops.dsp_load = snd_usX2Y_hwdep_dsp_load;
         hw->ops.mmap = snd_us428ctls_mmap;
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index c545a02dee48..5ce0da23ee96 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -333,18 +333,21 @@ static struct usb_device_id snd_usX2Y_usb_id_table[] = {
         { /* terminator */ }
 };
 
-static struct snd_card *usX2Y_create_card(struct usb_device *device)
+static int usX2Y_create_card(struct usb_device *device, struct snd_card **cardp)
 {
         int             dev;
         struct snd_card *       card;
+        int err;
+
         for (dev = 0; dev < SNDRV_CARDS; ++dev)
                 if (enable[dev] && !snd_usX2Y_card_used[dev])
                         break;
         if (dev >= SNDRV_CARDS)
-                return NULL;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct usX2Ydev));
-        if (!card)
-                return NULL;
+                return -ENODEV;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct usX2Ydev), &card);
+        if (err < 0)
+                return err;
         snd_usX2Y_card_used[usX2Y(card)->chip.index = dev] = 1;
         card->private_free = snd_usX2Y_card_private_free;
         usX2Y(card)->chip.dev = device;
@@ -362,26 +365,36 @@ static struct snd_card *usX2Y_create_card(struct usb_device *device)
                 usX2Y(card)->chip.dev->bus->busnum, usX2Y(card)->chip.dev->devnum
                 );
         snd_card_set_dev(card, &device->dev);
-        return card;
+        *cardp = card;
+        return 0;
 }
 
 
-static void *usX2Y_usb_probe(struct usb_device *device, struct usb_interface *intf, const struct usb_device_id *device_id)
+static int usX2Y_usb_probe(struct usb_device *device,
+                           struct usb_interface *intf,
+                           const struct usb_device_id *device_id,
+                           struct snd_card **cardp)
 {
         int             err;
         struct snd_card *       card;
+
+        *cardp = NULL;
         if (le16_to_cpu(device->descriptor.idVendor) != 0x1604 ||
             (le16_to_cpu(device->descriptor.idProduct) != USB_ID_US122 &&
              le16_to_cpu(device->descriptor.idProduct) != USB_ID_US224 &&
-             le16_to_cpu(device->descriptor.idProduct) != USB_ID_US428) ||
-            !(card = usX2Y_create_card(device)))
-                return NULL;
+             le16_to_cpu(device->descriptor.idProduct) != USB_ID_US428))
+                return -EINVAL;
+
+        err = usX2Y_create_card(device, &card);
+        if (err < 0)
+                return err;
         if ((err = usX2Y_hwdep_new(card, device)) < 0  ||
             (err = snd_card_register(card)) < 0) {
                 snd_card_free(card);
-                return NULL;
+                return err;
         }
-        return card;
+        *cardp = card;
+        return 0;
 }
 
 /*
@@ -389,13 +402,14 @@ static void *usX2Y_usb_probe(struct usb_device *device, struct usb_interface *in
  */
 static int snd_usX2Y_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
-        void *chip;
-        chip = usX2Y_usb_probe(interface_to_usbdev(intf), intf, id);
-        if (chip) {
-                usb_set_intfdata(intf, chip);
-                return 0;
-        } else
-                return -EIO;
+        struct snd_card *card;
+        int err;
+
+        err = usX2Y_usb_probe(interface_to_usbdev(intf), intf, id, &card);
+        if (err < 0)
+                return err;
+        dev_set_drvdata(&intf->dev, card);
+        return 0;
 }
 
 static void snd_usX2Y_disconnect(struct usb_interface *intf)