diff --git a/[refs] b/[refs]
index e266f71f4c3f..4838f7255872 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee45ddc1e03afc221afad273503b6c2fc0683008
+refs/heads/master: 2b9b325d73dc092e1b888c381b98dde57d394194
diff --git a/trunk/drivers/media/radio/radio-wl1273.c b/trunk/drivers/media/radio/radio-wl1273.c
index 9b0c9fa0beb8..6e55e93c0cf6 100644
--- a/trunk/drivers/media/radio/radio-wl1273.c
+++ b/trunk/drivers/media/radio/radio-wl1273.c
@@ -2084,8 +2084,7 @@ static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
 	}
 
 	/* V4L2 configuration */
-	memcpy(&radio->videodev, &wl1273_viddev_template,
-	       sizeof(wl1273_viddev_template));
+	radio->videodev = wl1273_viddev_template;
 
 	radio->videodev.v4l2_dev = &radio->v4l2dev;