diff --git a/[refs] b/[refs]
index 839daaf028c6..80353ba98c6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97ce5670fcee40b37f75d227ed88dcc51af63140
+refs/heads/master: d5492fb9ed3f3f25c56b25684072f0d234863b08
diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c
index acd6e0c2970e..34854b0a94a5 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-video.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-video.c
@@ -1223,7 +1223,6 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 	if (0 != t->index)
 		return -EINVAL;
 
-	memset(t, 0, sizeof(*t));
 	strcpy(t->name, "Television");
 
 	return 0;