Merge branch 'kvm-arm/vgic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / media / pci / zoran / zoran_card.c

diff --git a/drivers/media/pci/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c
index a90a3b9b09bff6074f1f06c808b655425b1180c2..bb53d2488ad08be66206b9aa478fff2f91068a0f 100644 (file)
--- a/drivers/media/pci/zoran/zoran_card.c
+++ b/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));