Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits)
  ALSA: hda - Add quirk for Acer Ferrari 5000
  ALSA: hda - Use cached calls to get widget caps and pin caps
  ALSA: hda - Don't create empty/single-item input source
  ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c
  ALSA: hda - Cache pin-cap values
  ALSA: hda - Avoid output amp manipulation to digital mic pins
  ALSA: hda - Add function id to proc output
  ALSA: pcm - Safer boundary checks
  ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272
  ALSA: sound/ali5451: typo: s/resouces/resources/
  ALSA: hda - Don't show the current connection for power widgets
  ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
  ASoC: Declare Headset as Mic and Headphone widgets for SDP3430
  ASoC: OMAP: N810: Add more jack functions
  ASoC: OMAP: N810: Mark not connected input pins
  ASoC: Add FLL support for WM8400
  ALSA: hda - Don't reset stream at each prepare callback
  ALSA: hda - Don't reset BDL unnecessarily
  ALSA: pcm - Fix delta calculation at boundary overlap
  ALSA: pcm - Reset invalid position even without debug option
  ...

5 files changed, 74 insertions, 60 deletions

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 1558a5c4094f..4af8740db717 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -30,9 +30,6 @@
 #include "usbusx2y.h"
 #include "usX2Yhwdep.h"
 
-int usX2Y_hwdep_pcm_new(struct snd_card *card);
-
-
 static int snd_us428ctls_vm_fault(struct vm_area_struct *area,
                                   struct vm_fault *vmf)
 {
@@ -106,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)
 {
@@ -267,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/usb_stream.c b/sound/usb/usx2y/usb_stream.c
index 70b96355ca4c..24393dafcb6e 100644
--- a/sound/usb/usx2y/usb_stream.c
+++ b/sound/usb/usx2y/usb_stream.c
@@ -557,7 +557,7 @@ static void stream_start(struct usb_stream_kernel *sk,
                 s->idle_insize -= max_diff - max_diff_0;
                 s->idle_insize += urb_size - s->period_size;
                 if (s->idle_insize < 0) {
-                        snd_printk("%i %i %i\n",
+                        snd_printk(KERN_WARNING "%i %i %i\n",
                                    s->idle_insize, urb_size, s->period_size);
                         return;
                 } else if (s->idle_insize == 0) {
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 11639bd72a51..5ce0da23ee96 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -227,9 +227,9 @@ static void i_usX2Y_In04Int(struct urb *urb)
         
         if (usX2Y->US04) {
                 if (0 == usX2Y->US04->submitted)
-                        do
+                        do {
                                 err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC);
-                        while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
+                        } while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
         } else
                 if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) {
                         if (us428ctls->p4outLast != us428ctls->p4outSent) {
@@ -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)
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.h b/sound/usb/usx2y/usx2yhwdeppcm.h
index c3382fdc386b..9c4fb84b2aa0 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.h
+++ b/sound/usb/usx2y/usx2yhwdeppcm.h
@@ -18,3 +18,5 @@ struct snd_usX2Y_hwdep_pcm_shm {
         volatile unsigned captured_iso_frames;
         int capture_iso_start;
 };
+
+int usX2Y_hwdep_pcm_new(struct snd_card *card);