diff --git a/[refs] b/[refs] index 863e8ce80c65..1d46c8d850fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37320d7bc0180979d49de21b90f30a97f57b3ee1 +refs/heads/master: d3a950918446e201f0f9048995badc4fe8ba4e20 diff --git a/trunk/drivers/media/usb/dvb-usb/friio-fe.c b/trunk/drivers/media/usb/dvb-usb/friio-fe.c index 90a70c66a96e..d56f927fc31a 100644 --- a/trunk/drivers/media/usb/dvb-usb/friio-fe.c +++ b/trunk/drivers/media/usb/dvb-usb/friio-fe.c @@ -421,11 +421,10 @@ struct dvb_frontend *jdvbt90502_attach(struct dvb_usb_device *d) /* setup the state */ state->i2c = &d->i2c_adap; - memcpy(&state->config, &friio_fe_config, sizeof(friio_fe_config)); + state->config = friio_fe_config; /* create dvb_frontend */ - memcpy(&state->frontend.ops, &jdvbt90502_ops, - sizeof(jdvbt90502_ops)); + state->frontend.ops = jdvbt90502_ops; state->frontend.demodulator_priv = state; if (jdvbt90502_init(&state->frontend) < 0)