From d02bca59ce10e1600dd72bcd35e23d09bc363d55 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sun, 5 Aug 2012 16:40:02 -0300 Subject: [PATCH] --- yaml --- r: 330772 b: refs/heads/master c: 8d9b2584ffd270da14671ff6a2b25dd40dcc41de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/cxd2099/cxd2099.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb1cd9ad559b..fc9f67f2a473 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ada3678c6a9a0c404acf15e98679315b29689b73 +refs/heads/master: 8d9b2584ffd270da14671ff6a2b25dd40dcc41de diff --git a/trunk/drivers/staging/media/cxd2099/cxd2099.c b/trunk/drivers/staging/media/cxd2099/cxd2099.c index 4f2235f2153d..0ff19724992f 100644 --- a/trunk/drivers/staging/media/cxd2099/cxd2099.c +++ b/trunk/drivers/staging/media/cxd2099/cxd2099.c @@ -696,13 +696,13 @@ struct dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg, return NULL; mutex_init(&ci->lock); - memcpy(&ci->cfg, cfg, sizeof(struct cxd2099_cfg)); + ci->cfg = *cfg; ci->i2c = i2c; ci->lastaddress = 0xff; ci->clk_reg_b = 0x4a; ci->clk_reg_f = 0x1b; - memcpy(&ci->en, &en_templ, sizeof(en_templ)); + ci->en = en_templ; ci->en.data = ci; init(ci); printk(KERN_INFO "Attached CXD2099AR at %02x\n", ci->cfg.adr);