diff --git a/[refs] b/[refs]
index 5967a86b3668..c9e469f267b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 630081e99072f94788011badd6d12707fa3ab410
+refs/heads/master: 23ba641a08a5cf1194cfba8480ecfab8b6623110
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c b/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c
index 7c0ed1bc49c2..781feed406f7 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -499,10 +499,8 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
 
 	BUG_ON(!dev->cx231xx_send_usb_command);
 
-	memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap));
-	memcpy(&bus->i2c_client, &cx231xx_client_template,
-	       sizeof(bus->i2c_client));
-
+	bus->i2c_adap = cx231xx_adap_template;
+	bus->i2c_client = cx231xx_client_template;
 	bus->i2c_adap.dev.parent = &dev->udev->dev;
 
 	strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));