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
  ...

1 files changed, 16 insertions, 14 deletions

diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 4c095bc7c729..a34ae7b1f7d0 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -338,15 +338,16 @@ snd_wavefront_free(struct snd_card *card)
         }
 }
 
-static struct snd_card *snd_wavefront_card_new(int dev)
+static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
 {
         struct snd_card *card;
         snd_wavefront_card_t *acard;
+        int err;
 
-        card = snd_card_new (index[dev], id[dev], THIS_MODULE,
-                             sizeof(snd_wavefront_card_t));
-        if (card == NULL)
-                return NULL;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(snd_wavefront_card_t), &card);
+        if (err < 0)
+                return err;
 
         acard = card->private_data;
         acard->wavefront.irq = -1;
@@ -357,7 +358,8 @@ static struct snd_card *snd_wavefront_card_new(int dev)
         acard->wavefront.card = card;
         card->private_free = snd_wavefront_free;
 
-        return card;
+        *cardp = card;
+        return 0;
 }
 
 static int __devinit
@@ -551,11 +553,11 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,
                 return 0;
 #endif
         if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk("specify CS4232 port\n");
+                snd_printk(KERN_ERR "specify CS4232 port\n");
                 return 0;
         }
         if (ics2115_port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk("specify ICS2115 port\n");
+                snd_printk(KERN_ERR "specify ICS2115 port\n");
                 return 0;
         }
         return 1;
@@ -567,9 +569,9 @@ static int __devinit snd_wavefront_isa_probe(struct device *pdev,
         struct snd_card *card;
         int err;
 
-        card = snd_wavefront_card_new(dev);
-        if (! card)
-                return -ENOMEM;
+        err = snd_wavefront_card_new(dev, &card);
+        if (err < 0)
+                return err;
         snd_card_set_dev(card, pdev);
         if ((err = snd_wavefront_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -616,9 +618,9 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
 
-        card = snd_wavefront_card_new(dev);
-        if (! card)
-                return -ENOMEM;
+        res = snd_wavefront_card_new(dev, &card);
+        if (res < 0)
+                return res;
 
         if (snd_wavefront_pnp (dev, card->private_data, pcard, pid) < 0) {
                 if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {