Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[linux-block.git] / drivers / media / usb / pvrusb2 / pvrusb2-encoder.c

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-encoder.c b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
index e046fdaec5ae21de6971d36bbd857efde08df1a5..f7702aeeda3f8b72074aaec08f53e81eabc959db 100644 (file)
--- a/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c
@@ -422,8 +422,7 @@ int pvr2_encoder_adjust(struct pvr2_hdw *hdw)
                pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                           "Error from cx2341x module code=%d",ret);
        } else {
-               memcpy(&hdw->enc_cur_state,&hdw->enc_ctl_state,
-                      sizeof(struct cx2341x_mpeg_params));
+               hdw->enc_cur_state = hdw->enc_ctl_state;
                hdw->enc_cur_valid = !0;
        }
        return ret;