diff --git a/[refs] b/[refs]
index b8a213c747ab..40fa18b8a906 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3618acab2ccefe292a3b1a1d7295f1368023b71a
+refs/heads/master: 2e814af502e0fc5983cbb96fc8c0c64fe49a9340
diff --git a/trunk/drivers/media/pci/cx18/cx18-i2c.c b/trunk/drivers/media/pci/cx18/cx18-i2c.c
index 4908eb7bcf6c..d61ac6393e7e 100644
--- a/trunk/drivers/media/pci/cx18/cx18-i2c.c
+++ b/trunk/drivers/media/pci/cx18/cx18-i2c.c
@@ -240,15 +240,13 @@ int init_cx18_i2c(struct cx18 *cx)
 
 	for (i = 0; i < 2; i++) {
 		/* Setup algorithm for adapter */
-		memcpy(&cx->i2c_algo[i], &cx18_i2c_algo_template,
-			sizeof(struct i2c_algo_bit_data));
+		cx->i2c_algo[i] = cx18_i2c_algo_template;
 		cx->i2c_algo_cb_data[i].cx = cx;
 		cx->i2c_algo_cb_data[i].bus_index = i;
 		cx->i2c_algo[i].data = &cx->i2c_algo_cb_data[i];
 
 		/* Setup adapter */
-		memcpy(&cx->i2c_adap[i], &cx18_i2c_adap_template,
-			sizeof(struct i2c_adapter));
+		cx->i2c_adap[i] = cx18_i2c_adap_template;
 		cx->i2c_adap[i].algo_data = &cx->i2c_algo[i];
 		sprintf(cx->i2c_adap[i].name + strlen(cx->i2c_adap[i].name),
 				" #%d-%d", cx->instance, i);