From 6451454f72d861ab9add5ec22f86f700fc8f338a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= Date: Wed, 27 Jun 2012 12:52:51 -0300 Subject: [PATCH] --- yaml --- r: 320645 b: refs/heads/master c: ddebe8cdd6c8d5f937c6587d2636079a5d096247 h: refs/heads/master i: 320643: d42bb3b93c461a18acb8883d29e7ece67929ae22 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7164/saa7164-i2c.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0b5dac88eb95..bcfaa6fbaa9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a6fa3fe9a465d1c5e1e6bf8a4ad1ca9063131a5 +refs/heads/master: ddebe8cdd6c8d5f937c6587d2636079a5d096247 diff --git a/trunk/drivers/media/video/saa7164/saa7164-i2c.c b/trunk/drivers/media/video/saa7164/saa7164-i2c.c index d8d7baa4c636..4f7e3b42263f 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-i2c.c +++ b/trunk/drivers/media/video/saa7164/saa7164-i2c.c @@ -97,11 +97,8 @@ int saa7164_i2c_register(struct saa7164_i2c *bus) dprintk(DBGLVL_I2C, "%s(bus = %d)\n", __func__, bus->nr); - memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template, - sizeof(bus->i2c_adap)); - - memcpy(&bus->i2c_client, &saa7164_i2c_client_template, - sizeof(bus->i2c_client)); + bus->i2c_adap = saa7164_i2c_adap_template; + bus->i2c_client = saa7164_i2c_client_template; bus->i2c_adap.dev.parent = &dev->pci->dev;