From 1102962df06bac326d67793272c65c20f7f84957 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 23 Oct 2012 15:57:24 -0300 Subject: [PATCH] --- yaml --- r: 357221 b: refs/heads/master c: ee45ddc1e03afc221afad273503b6c2fc0683008 h: refs/heads/master i: 357219: ead3068370b36fee8ee4408ee1535fe8b75cb892 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb-frontends/cx24116.c | 2 +- trunk/drivers/media/dvb-frontends/drxd_hard.c | 5 ++--- trunk/drivers/media/dvb-frontends/stv0299.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dbe692536731..e266f71f4c3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9b1b3a8f7b76035140912bc9e3a325e58fc6d58 +refs/heads/master: ee45ddc1e03afc221afad273503b6c2fc0683008 diff --git a/trunk/drivers/media/dvb-frontends/cx24116.c b/trunk/drivers/media/dvb-frontends/cx24116.c index b48879186537..2916d7c74a1d 100644 --- a/trunk/drivers/media/dvb-frontends/cx24116.c +++ b/trunk/drivers/media/dvb-frontends/cx24116.c @@ -819,7 +819,7 @@ static int cx24116_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) static void cx24116_clone_params(struct dvb_frontend *fe) { struct cx24116_state *state = fe->demodulator_priv; - memcpy(&state->dcur, &state->dnxt, sizeof(state->dcur)); + state->dcur = state->dnxt; } /* Wait for LNB */ diff --git a/trunk/drivers/media/dvb-frontends/drxd_hard.c b/trunk/drivers/media/dvb-frontends/drxd_hard.c index 487c53b69bf3..9a2134792cfa 100644 --- a/trunk/drivers/media/dvb-frontends/drxd_hard.c +++ b/trunk/drivers/media/dvb-frontends/drxd_hard.c @@ -2965,7 +2965,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config, return NULL; memset(state, 0, sizeof(*state)); - memcpy(&state->ops, &drxd_ops, sizeof(struct dvb_frontend_ops)); + state->ops = drxd_ops; state->dev = dev; state->config = *config; state->i2c = i2c; @@ -2976,8 +2976,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config, if (Read16(state, 0, 0, 0) < 0) goto error; - memcpy(&state->frontend.ops, &drxd_ops, - sizeof(struct dvb_frontend_ops)); + state->frontend.ops = drxd_ops; state->frontend.demodulator_priv = state; ConfigureMPEGOutput(state, 0); /* add few initialization to allow gate control */ diff --git a/trunk/drivers/media/dvb-frontends/stv0299.c b/trunk/drivers/media/dvb-frontends/stv0299.c index 92a6075cd82f..b57ecf42e75a 100644 --- a/trunk/drivers/media/dvb-frontends/stv0299.c +++ b/trunk/drivers/media/dvb-frontends/stv0299.c @@ -420,7 +420,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long do_gettimeofday (&nexttime); if (debug_legacy_dish_switch) - memcpy (&tv[0], &nexttime, sizeof (struct timeval)); + tv[0] = nexttime; stv0299_writeregI (state, 0x0c, reg0x0c | 0x50); /* set LNB to 18V */ dvb_frontend_sleep_until(&nexttime, 32000);