Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[mv-sheeva.git] / drivers / media / video / cx231xx / cx231xx-audio.c

diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c
index 0027b906f6145a455a58ff47e2cb6e5349a9d63c..7793d60966db51fc36fb2de5bde7440030977068 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-audio.c
+++ b/drivers/media/video/cx231xx/cx231xx-audio.c
@@ -478,9 +478,10 @@ static int cx231xx_audio_init(struct cx231xx *dev)
        cx231xx_info("cx231xx-audio.c: probing for cx231xx "
                     "non standard usbaudio\n");
 
-       card = snd_card_new(index[devnr], "Cx231xx Audio", THIS_MODULE, 0);
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(index[devnr], "Cx231xx Audio", THIS_MODULE,
+                             0, &card);
+       if (err < 0)
+               return err;
 
        spin_lock_init(&adev->slock);
        err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm);
@@ -517,7 +518,7 @@ static int cx231xx_audio_init(struct cx231xx *dev)
                        bEndpointAddress);
 
        adev->num_alt = uif->num_altsetting;
-       cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
+       cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
                     adev->end_point_addr, adev->num_alt);
        adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);