public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Kai Engert <kaie@kuix.de>
To: linux-kernel@vger.kernel.org
Cc: greg@kroah.com, webcam@smcc.demon.nl
Subject: small patch: enable pwc usb camera driver
Date: Mon, 07 Jun 2004 15:00:43 +0200	[thread overview]
Message-ID: <40C466FB.1040309@kuix.de> (raw)

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

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

[-- Attachment #2: pwcdiff --]
[-- Type: text/plain, Size: 1722 bytes --]

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);

             reply	other threads:[~2004-06-07 13:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-06-07 13:00 Kai Engert [this message]
2004-06-07 20:20 ` small patch: enable pwc usb camera driver Greg KH
2004-06-07 22:27   ` Nemosoft Unv.
2004-06-07 22:39     ` Greg KH
2004-06-17 12:37       ` Kai Engert
2004-06-17 19:58         ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=40C466FB.1040309@kuix.de \
    --to=kaie@kuix.de \
    --cc=greg@kroah.com \
    --cc=kai.engert@gmx.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=webcam@smcc.demon.nl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox