diff --git a/[refs] b/[refs]
index d45a04bded37..d798e10e76a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5caeba045c3a676b892790c6685e542f81a4f96e
+refs/heads/master: 65c9fd4609ccbabe4aa354eeab7823507424d8b3
diff --git a/trunk/drivers/media/video/em28xx/em28xx-audio.c b/trunk/drivers/media/video/em28xx/em28xx-audio.c
index 215ee789f107..4a42b29481b6 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-audio.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-audio.c
@@ -424,7 +424,7 @@ static int em28xx_audio_init(struct em28xx *dev)
 	struct snd_pcm      *pcm;
 	struct snd_card     *card;
 	static int          devnr;
-	int                 ret, err;
+	int                 err;
 
 	if (dev->has_audio_class) {
 		/* This device does not support the extension (in this case