---

yaml --- r: 357209 b: refs/heads/master c: 37320d7 h: refs/heads/master i: 357207: 6a36ad9 v: v3
git-mirror · Dec 27, 2012 · 8208b9a · 8208b9a
1 parent 7018495
commit 8208b9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ba6220fe3b1ffbb3106faae48eee3bcbd27b553
+refs/heads/master: 37320d7bc0180979d49de21b90f30a97f57b3ee1
diff --git a/trunk/drivers/media/pci/zoran/zoran_card.c b/trunk/drivers/media/pci/zoran/zoran_card.c
@@ -708,8 +708,7 @@ static const struct i2c_algo_bit_data zoran_i2c_bit_data_template = {
 static int
 zoran_register_i2c (struct zoran *zr)
 {
-	memcpy(&zr->i2c_algo, &zoran_i2c_bit_data_template,
-	       sizeof(struct i2c_algo_bit_data));
+	zr->i2c_algo = zoran_i2c_bit_data_template;
 	zr->i2c_algo.data = zr;
 	strlcpy(zr->i2c_adapter.name, ZR_DEVNAME(zr),
 		sizeof(zr->i2c_adapter.name));