Messages in this thread Patch in this message | | | Date | Mon, 07 Jun 2004 15:00:43 +0200 | From | Kai Engert <> | Subject | small patch: enable pwc usb camera driver |
| |
The attached patch enables the pwc driver included with kernel 2.6.7-rc2
It also removes the warnings during compilation. However, note that I blindly duplicated the release approach used by other usb camera drivers, replacing the current no-op.
The driver works for me with a Logitech QuickCam Notebook Pro and GnomeMeeting.
Regards, Kai diff -ruw org/linux-2.6.7-rc2/drivers/usb/media/Kconfig linux-2.6.7-rc2/drivers/usb/media/Kconfig --- org/linux-2.6.7-rc2/drivers/usb/media/Kconfig 2004-05-30 08:25:41.000000000 +0200 +++ linux-2.6.7-rc2/drivers/usb/media/Kconfig 2004-06-07 11:27:03.000000000 +0200 @@ -108,7 +108,7 @@ config USB_PWC tristate "USB Philips Cameras" - depends on USB && VIDEO_DEV && BROKEN + depends on USB && VIDEO_DEV ---help--- Say Y or M here if you want to use one of these Philips & OEM webcams: diff -ruw org/linux-2.6.7-rc2/drivers/usb/media/pwc-if.c linux-2.6.7-rc2/drivers/usb/media/pwc-if.c --- org/linux-2.6.7-rc2/drivers/usb/media/pwc-if.c 2004-05-30 08:26:27.000000000 +0200 +++ linux-2.6.7-rc2/drivers/usb/media/pwc-if.c 2004-06-07 11:42:50.000000000 +0200 @@ -129,7 +129,6 @@ static int pwc_video_open(struct inode *inode, struct file *file); static int pwc_video_close(struct inode *inode, struct file *file); -static int pwc_video_release(struct video_device *); static ssize_t pwc_video_read(struct file *file, char *buf, size_t count, loff_t *ppos); static unsigned int pwc_video_poll(struct file *file, poll_table *wait); @@ -1121,12 +1120,6 @@ return 0; } -static int pwc_video_release(struct video_device *vfd) -{ - Trace(TRACE_OPEN, "pwc_video_release() called. Now what?\n"); -} - - /* * FIXME: what about two parallel reads ???? * ANSWER: Not supported. You can't open the device more than once, @@ -1855,7 +1848,7 @@ } } - pdev->vdev.release = pwc_video_release; + pdev->vdev.release = video_device_release; i = video_register_device(&pdev->vdev, VFL_TYPE_GRABBER, video_nr); if (i < 0) { Err("Failed to register as video device (%d).\n", i); | |