From 59ed082193ebcd2471bca09f1588023689adcf51 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <elezegarcia@gmail.com>
Date: Tue, 23 Oct 2012 15:57:09 -0300
Subject: [PATCH] --- yaml --- r: 357206 b: refs/heads/master c:
 5338c16905ed7e8145861e1dacdd4eadce18f2b9 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/media/usb/pvrusb2/pvrusb2-encoder.c  | 3 +--
 trunk/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 ++--
 trunk/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index def0f998e745..a25c719e73a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c2edefed74fb29b35634bce1b4c38ce1fdb2ce6
+refs/heads/master: 5338c16905ed7e8145861e1dacdd4eadce18f2b9
diff --git a/trunk/drivers/media/usb/pvrusb2/pvrusb2-encoder.c b/trunk/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
index e046fdaec5ae..f7702aeeda3f 100644
--- a/trunk/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
+++ b/trunk/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
@@ -422,8 +422,7 @@ int pvr2_encoder_adjust(struct pvr2_hdw *hdw)
 		pvr2_trace(PVR2_TRACE_ERROR_LEGS,
 			   "Error from cx2341x module code=%d",ret);
 	} else {
-		memcpy(&hdw->enc_cur_state,&hdw->enc_ctl_state,
-		       sizeof(struct cx2341x_mpeg_params));
+		hdw->enc_cur_state = hdw->enc_ctl_state;
 		hdw->enc_cur_valid = !0;
 	}
 	return ret;
diff --git a/trunk/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c b/trunk/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
index 9ab596c78a4e..b5e929f1bf82 100644
--- a/trunk/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
+++ b/trunk/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
@@ -649,8 +649,8 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
 	}
 
 	// Configure the adapter and set up everything else related to it.
-	memcpy(&hdw->i2c_adap,&pvr2_i2c_adap_template,sizeof(hdw->i2c_adap));
-	memcpy(&hdw->i2c_algo,&pvr2_i2c_algo_template,sizeof(hdw->i2c_algo));
+	hdw->i2c_adap = pvr2_i2c_adap_template;
+	hdw->i2c_algo = pvr2_i2c_algo_template;
 	strlcpy(hdw->i2c_adap.name,hdw->name,sizeof(hdw->i2c_adap.name));
 	hdw->i2c_adap.dev.parent = &hdw->usb_dev->dev;
 	hdw->i2c_adap.algo = &hdw->i2c_algo;
diff --git a/trunk/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index 6930676051e7..34c3b6e80e86 100644
--- a/trunk/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/trunk/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -1339,7 +1339,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
 		return;
 	}
 
-	memcpy(&dip->devbase,&vdev_template,sizeof(vdev_template));
+	dip->devbase = vdev_template;
 	dip->devbase.release = pvr2_video_device_release;
 	dip->devbase.ioctl_ops = &pvr2_ioctl_ops;
 	{