diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 12:10:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 12:10:50 +0200 |
| commit | 35780c8ea7ad5c6d5483244d5f5bf37176fda86a (patch) | |
| tree | 2bc34969f558da2a9b3de915e3f2499a959085da /drivers/media/video/usbvideo/usbvideo.c | |
| parent | 6ce37a58e334ef773f88283939afc9f4965c7697 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | talos-op-linux-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.tar.gz talos-op-linux-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.zip | |
Merge commit 'v2.6.27-rc1' into x86/urgent
Diffstat (limited to 'drivers/media/video/usbvideo/usbvideo.c')
| -rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 4128ee20b64e..bf1bc2f69b02 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c @@ -952,8 +952,6 @@ static const struct file_operations usbvideo_fops = { .llseek = no_llseek, }; static const struct video_device usbvideo_template = { - .owner = THIS_MODULE, - .type = VID_TYPE_CAPTURE, .fops = &usbvideo_fops, }; @@ -1040,7 +1038,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd) err("%s: uvd->dev == NULL", __func__); return -EINVAL; } - uvd->vdev.dev = &uvd->dev->dev; + uvd->vdev.parent = &uvd->dev->dev; if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { err("%s: video_register_device failed", __func__); return -EPIPE; |
