Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge

diff --cc sound/isa/ad1816a/ad1816a.c
index 15f60107a11e4edb63da106549eb45349a98595b,9660e598232c5614af35aeb6cf17bdf20f4ef060..bbcbf92a8ebea1cb11aa8d164f7651d6ab87d11d
--- 1/sound/isa/ad1816a/ad1816a.c
--- 2/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@@ -156,11 -156,11 +156,12 @@@ static int __devinit snd_card_ad1816a_p
        struct snd_card_ad1816a *acard;
        struct snd_ad1816a *chip;
        struct snd_opl3 *opl3;
 +      struct snd_timer *timer;
  
-       if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                                sizeof(struct snd_card_ad1816a))) == NULL)
-               return -ENOMEM;
+       error = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                               sizeof(struct snd_card_ad1816a), &card);
+       if (error < 0)
+               return error;
        acard = (struct snd_card_ad1816a *)card->private_data;
  
        if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {

diff --cc sound/isa/cmi8330.c
Simple merge

diff --cc sound/isa/es1688/es1688.c
Simple merge

diff --cc sound/isa/gus/interwave.c
Simple merge

diff --cc sound/isa/opl3sa2.c
Simple merge

diff --cc sound/isa/opti9xx/opti92x-ad1848.c
Simple merge

diff --cc sound/isa/sc6000.c
Simple merge

diff --cc sound/isa/wavefront/wavefront.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/ppc/snd_ps3.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/usb/caiaq/caiaq-device.c
Simple merge