diff --git a/[refs] b/[refs] index b9dc51ee83a0..def0f998e745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5869bb39f8e1f671746dcb5f070e3b1c38b23e5c +refs/heads/master: 5c2edefed74fb29b35634bce1b4c38ce1fdb2ce6 diff --git a/trunk/drivers/media/usb/pwc/pwc-if.c b/trunk/drivers/media/usb/pwc/pwc-if.c index 21c15233c6ae..5ec15cb1ed26 100644 --- a/trunk/drivers/media/usb/pwc/pwc-if.c +++ b/trunk/drivers/media/usb/pwc/pwc-if.c @@ -1008,7 +1008,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id } /* Init video_device structure */ - memcpy(&pdev->vdev, &pwc_template, sizeof(pwc_template)); + pdev->vdev = pwc_template; strcpy(pdev->vdev.name, name); pdev->vdev.queue = &pdev->vb_queue; pdev->vdev.queue->lock = &pdev->vb_queue_lock;