Merge branch 'topic/snd_card_new-err' into topic/drop-l3

[linux-2.6-omap-h63xx.git] / sound / arm / sa11xx-uda1341.c

diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index ed481a866a3e7f1910b0f1bc8860a3ec9d1df4ee..7101d3d8bae61d4e73342ac169fb901a8518d681 100644 (file)
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -887,9 +887,10 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr)
        struct sa11xx_uda1341 *chip;
 
        /* register the soundcard */
-       card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct sa11xx_uda1341));
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(-1, id, THIS_MODULE,
+                             sizeof(struct sa11xx_uda1341), &card);
+       if (err < 0)
+               return err;
 
        chip = card->private_data;
        spin_lock_init(&chip->s[0].dma_lock);