[KJ] [PATCH 2/2] Remove LINUX_VERSION_CODE check in pwc/pwc-if.c

[KJ] [PATCH 2/2] Remove LINUX_VERSION_CODE check in pwc/pwc-if.c

[Eric Sesterhenn / snakebyte]

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

hi,

this patch removes the LINUX_VERSION check in
drivers/usb/media/pwc/pwc-if.c

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>

--- linux-2.6.15-eric/drivers/usb/media/pwc/pwc-if.c.orig	2006-01-04 18:03:17.000000000 +0100
+++ linux-2.6.15-eric/drivers/usb/media/pwc/pwc-if.c	2006-01-04 18:03:44.000000000 +0100
@@ -827,13 +827,10 @@ static int pwc_isoc_init(struct pwc_devi
 	/* Get the current alternate interface, adjust packet size */
 	if (!udev->actconfig)
 		return -EFAULT;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5)
-	idesc = &udev->actconfig->interface[0]->altsetting[pdev->valternate];
-#else
+
 	intf = usb_ifnum_to_if(udev, 0);
 	if (intf)
 		idesc = usb_altnum_to_altsetting(intf, pdev->valternate);
-#endif
 		
 	if (!idesc)
 		return -EFAULT;



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

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH 2/2] Remove LINUX_VERSION_CODE check in pwc/pwc-if.c

[Greg KH]

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

On Wed, Jan 04, 2006 at 06:12:30PM +0100, Eric Sesterhenn / snakebyte wrote:
> hi,
> 
> this patch removes the LINUX_VERSION check in
> drivers/usb/media/pwc/pwc-if.c
> 
> Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>

How about redoing this and take out the #include <linux/version.h> at
the same time, as it should no longer be needed?

And do the same thing for the pwc-ctrl.c file perhaps?

thanks,

greg k-h

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

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors