Re: [PATCH] Creative WebCam mini driver

[Alexey Dobriyan <adobriyan@gmail.com>]

On Thursday 02 June 2005 19:35, Kiril Jovchev wrote:

> So now I'm sending the patch again for 2.6.11.11 kernel what is latest stable.

You're lucky it applies cleanly against 2.6.12-rc5-whatever. ;-)

There is no need to split the patch into two ones. Next time CC
linux-usb-devel@lists.sourceforge.net. Add "-p" to your diff switches.

> --- linux-2.6.11.11/drivers/usb/media/stv680.c
> +++ linux/drivers/usb/media/stv680.c

> + * Creative WebCam Go Mini Driver, modified by Kiril Jovchev 

Trailing whitespace.

> + *
> + * ver 0.26 Sep, 2004 (kjv) 
> + * 			   Added support for Creative WebCam Go mini. 
> + * 			   Camera is based on same chip. 
> + * 

Trailing whitespace.

> @@ -1375,9 +1383,14 @@
>  	    (le16_to_cpu(dev->descriptor.idProduct) == USB_PENCAM_PRODUCT_ID)) {
>  		camera_name = "STV0680";
>  		PDEBUG (0, "STV(i): STV0680 camera found.");
> -	} else {
> -		PDEBUG (0, "STV(e): Vendor/Product ID do not match STV0680 values.");
> -		PDEBUG (0, "STV(e): Check that the STV0680 camera is connected to the computer.");
> +	} else if ((le16_to_cpu(dev->descriptor.idVendor) == USB_CREATIVEGOMINI_VENDOR_ID) &&
> +            (le16_to_cpu(dev->descriptor.idProduct) == USB_CREATIVEGOMINI_PRODUCT_ID)) {

VENDOR_ID and PRODUCT_ID are constants. You can do

	if ((dev->descriptor.idVendor == cpu_to_le16(VENDOR_ID)) &&
	    (dev->descriptor.idProduct == cpu_to_le16(PRODUCT_ID))) {

> +                camera_name = "Creative WebCam Go Mini";
> +                PDEBUG (0, "STV(i): Creative WebCam Go Mini found.");
> +	} 
> +	else {

"} else {", please.

> +		PDEBUG (0, "STV(e): Vendor/Product ID do not match STV0680 or Creative WebCam Go Mini values.");
> +		PDEBUG (0, "STV(e): Check that the STV0680 or Creative WebCam Go Mini camera is connected to the computer.");

> --- linux-2.6.11.11/drivers/usb/media/stv680.h
> +++ linux/drivers/usb/media/stv680.h

> +#define USB_CREATIVEGOMINI_VENDOR_ID 0x041e 

Trailing whitespace.

>  static struct usb_device_id device_table[] = {
>  	{USB_DEVICE (USB_PENCAM_VENDOR_ID, USB_PENCAM_PRODUCT_ID)},
> +	{USB_DEVICE (USB_CREATIVEGOMINI_VENDOR_ID, USB_CREATIVEGOMINI_PRODUCT_ID)},
>  	{}
> +	

Why add this line?

>  };
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/