diff --git a/[refs] b/[refs]
index 991efd240aed..883fdedca6ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11ee73b0cca8a6c521cc4ac849a07ccf119fd1a
+refs/heads/master: a938b8c5be8fe5c28800c9cef4aa43d569aa57a8
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-audio.c b/trunk/drivers/media/video/cx231xx/cx231xx-audio.c
index 9ab0628b9a11..7793d60966db 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-audio.c
+++ b/trunk/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);