diff --git a/[refs] b/[refs]
index c9e469f267b4..36cff392d46f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23ba641a08a5cf1194cfba8480ecfab8b6623110
+refs/heads/master: c21813e9746b174e4f426aa0fcb1a69c361a71b2
diff --git a/trunk/drivers/media/video/cx25821/cx25821-i2c.c b/trunk/drivers/media/video/cx25821/cx25821-i2c.c
index 0a44b4ea1cec..9844549764c9 100644
--- a/trunk/drivers/media/video/cx25821/cx25821-i2c.c
+++ b/trunk/drivers/media/video/cx25821/cx25821-i2c.c
@@ -305,11 +305,8 @@ int cx25821_i2c_register(struct cx25821_i2c *bus)
 
 	dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
 
-	memcpy(&bus->i2c_adap, &cx25821_i2c_adap_template,
-	       sizeof(bus->i2c_adap));
-	memcpy(&bus->i2c_client, &cx25821_i2c_client_template,
-	       sizeof(bus->i2c_client));
-
+	bus->i2c_adap = cx25821_i2c_adap_template;
+	bus->i2c_client = cx25821_i2c_client_template;
 	bus->i2c_adap.dev.parent = &dev->pci->dev;
 
 	strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));