ChangeSet 1.1722.97.42, 2004/06/07 12:59:41-07:00, kaie@kuix.de
[PATCH] USB: 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.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/usb/media/Kconfig | 2 +-
drivers/usb/media/pwc-if.c | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff -Nru a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
--- a/drivers/usb/media/Kconfig Fri Jun 18 11:01:30 2004
+++ b/drivers/usb/media/Kconfig Fri Jun 18 11:01:30 2004
@@ -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 -Nru a/drivers/usb/media/pwc-if.c b/drivers/usb/media/pwc-if.c
--- a/drivers/usb/media/pwc-if.c Fri Jun 18 11:01:30 2004
+++ b/drivers/usb/media/pwc-if.c Fri Jun 18 11:01:30 2004
@@ -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);