diff --git a/[refs] b/[refs]
index 40fa18b8a906..b9fc05c597fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e814af502e0fc5983cbb96fc8c0c64fe49a9340
+refs/heads/master: b4b1d04006540ebeb5c85222292cdcb2f95f217b
diff --git a/trunk/drivers/media/pci/bt8xx/bttv-i2c.c b/trunk/drivers/media/pci/bt8xx/bttv-i2c.c
index da400dbe4a10..99865f531199 100644
--- a/trunk/drivers/media/pci/bt8xx/bttv-i2c.c
+++ b/trunk/drivers/media/pci/bt8xx/bttv-i2c.c
@@ -366,8 +366,7 @@ int __devinit init_bttv_i2c(struct bttv *btv)
 
 		strlcpy(btv->c.i2c_adap.name, "bttv",
 			sizeof(btv->c.i2c_adap.name));
-		memcpy(&btv->i2c_algo, &bttv_i2c_algo_bit_template,
-		       sizeof(bttv_i2c_algo_bit_template));
+		btv->i2c_algo = bttv_i2c_algo_bit_template;
 		btv->i2c_algo.udelay = i2c_udelay;
 		btv->i2c_algo.data = btv;
 		btv->c.i2c_adap.algo_data = &btv->i2c_algo;