---

yaml --- r: 357211 b: refs/heads/master c: f01e0ff h: refs/heads/master i: 357209: 8208b9a 357207: 6a36ad9 v: v3
git-mirror · Dec 27, 2012 · c5db4ce · c5db4ce
1 parent af43223
commit c5db4ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3a950918446e201f0f9048995badc4fe8ba4e20
+refs/heads/master: f01e0ffd01eb0a8c6df71ac80234354ed716b488
diff --git a/trunk/drivers/media/usb/au0828/au0828-cards.c b/trunk/drivers/media/usb/au0828/au0828-cards.c
@@ -193,7 +193,7 @@ void au0828_card_setup(struct au0828_dev *dev)
 
 	dprintk(1, "%s()\n", __func__);
 
-	memcpy(&dev->board, &au0828_boards[dev->boardnr], sizeof(dev->board));
+	dev->board = au0828_boards[dev->boardnr];
 
 	if (dev->i2c_rc == 0) {
 		dev->i2c_client.addr = 0xa0 >> 1;

diff --git a/trunk/drivers/media/usb/au0828/au0828-i2c.c b/trunk/drivers/media/usb/au0828/au0828-i2c.c
@@ -364,12 +364,9 @@ int au0828_i2c_register(struct au0828_dev *dev)
 {
 	dprintk(1, "%s()\n", __func__);
 
-	memcpy(&dev->i2c_adap, &au0828_i2c_adap_template,
-	       sizeof(dev->i2c_adap));
-	memcpy(&dev->i2c_algo, &au0828_i2c_algo_template,
-	       sizeof(dev->i2c_algo));
-	memcpy(&dev->i2c_client, &au0828_i2c_client_template,
-	       sizeof(dev->i2c_client));
+	dev->i2c_adap = au0828_i2c_adap_template;
+	dev->i2c_algo = au0828_i2c_algo_template;
+	dev->i2c_client = au0828_i2c_client_template;
 
 	dev->i2c_adap.dev.parent = &dev->usbdev->dev;