---

yaml --- r: 357208 b: refs/heads/master c: 8ba6220 h: refs/heads/master v: v3
git-mirror · Dec 27, 2012 · 7018495 · 7018495
1 parent 6a36ad9
commit 7018495
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d486b94b2636ce169f7f2bb1a4a7973843cc72e3
+refs/heads/master: 8ba6220fe3b1ffbb3106faae48eee3bcbd27b553
diff --git a/trunk/drivers/media/i2c/cx25840/cx25840-ir.c b/trunk/drivers/media/i2c/cx25840/cx25840-ir.c
@@ -1251,13 +1251,11 @@ int cx25840_ir_probe(struct v4l2_subdev *sd)
 		cx25840_write4(ir_state->c, CX25840_IR_IRQEN_REG, 0);
 
 	mutex_init(&ir_state->rx_params_lock);
-	memcpy(&default_params, &default_rx_params,
-		       sizeof(struct v4l2_subdev_ir_parameters));
+	default_params = default_rx_params;
 	v4l2_subdev_call(sd, ir, rx_s_parameters, &default_params);
 
 	mutex_init(&ir_state->tx_params_lock);
-	memcpy(&default_params, &default_tx_params,
-		       sizeof(struct v4l2_subdev_ir_parameters));
+	default_params = default_tx_params;
 	v4l2_subdev_call(sd, ir, tx_s_parameters, &default_params);
 
 	return 0;