From 8208b9aa385e85a51c436a5beb79759f5ac064e9 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 23 Oct 2012 15:57:12 -0300 Subject: [PATCH] --- yaml --- r: 357209 b: refs/heads/master c: 37320d7bc0180979d49de21b90f30a97f57b3ee1 h: refs/heads/master i: 357207: 6a36ad9d818f2b57d407dfb4aa2717ad62731fbf v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/zoran/zoran_card.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8ce46c13e5bf..863e8ce80c65 100644 --- 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 index fffc54b452c8..cea325d3e530 100644 --- 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));