---

yaml --- r: 330772 b: refs/heads/master c: 8d9b258 h: refs/heads/master v: v3
git-mirror · Aug 12, 2012 · d02bca5 · d02bca5
1 parent 7d32e0d
commit d02bca5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);