diff --git a/[refs] b/[refs]
index d42caff379a0..2284bc246f16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 205161ed03b53c467dd669a340ea704ce0fb6f9e
+refs/heads/master: 629dcf23dffcf90f2104784d4ad9324ab3a1f2ef
diff --git a/trunk/drivers/staging/cx25821/cx25821-alsa.c b/trunk/drivers/staging/cx25821/cx25821-alsa.c
index 33e559d58b1b..1798975a69bd 100644
--- a/trunk/drivers/staging/cx25821/cx25821-alsa.c
+++ b/trunk/drivers/staging/cx25821/cx25821-alsa.c
@@ -718,7 +718,8 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
 		goto error;
 	}
 
-	if ((err == snd_cx25821_pcm(chip, 0, "cx25821 Digital")) < 0) {
+	err = snd_cx25821_pcm(chip, 0, "cx25821 Digital");
+	if (err < 0) {
 		printk(KERN_INFO
 		       "DEBUG ERROR: cannot create snd_cx25821_pcm %s\n",
 		       __func__);