diff --git a/[refs] b/[refs]
index 44f2d72233b8..18d88b2f9f18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5344fe6e041c1ff867cde87d8088abf845645655
+refs/heads/master: 3724dde9c8c9f55c31ce8c7f8f2645733d6a59ac
diff --git a/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c b/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c
index 94b573ad96d5..8d529565f163 100644
--- a/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -736,7 +736,7 @@ static void cx231xx_sleep_s5h1432(struct cx231xx *dev)
 
 static inline void cx231xx_set_model(struct cx231xx *dev)
 {
-	memcpy(&dev->board, &cx231xx_boards[dev->model], sizeof(dev->board));
+	dev->board = cx231xx_boards[dev->model];
 }
 
 /* Since cx231xx_pre_card_setup() requires a proper dev->model,
diff --git a/trunk/drivers/media/usb/cx231xx/cx231xx-video.c b/trunk/drivers/media/usb/cx231xx/cx231xx-video.c
index 239cb913be5c..93dfc182ec51 100644
--- a/trunk/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/trunk/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -2627,8 +2627,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
 		     dev->name, video_device_node_name(dev->vdev));
 
 	/* Initialize VBI template */
-	memcpy(&cx231xx_vbi_template, &cx231xx_video_template,
-	       sizeof(cx231xx_vbi_template));
+	cx231xx_vbi_template = cx231xx_video_template;
 	strcpy(cx231xx_vbi_template.name, "cx231xx-vbi");
 
 	/* Allocate and fill vbi video_device struct */