ov511-2.28 patch for 2.6.12 kernel compat.
PATCH 1/1 ov511-2.28 patch for 2.6.12 kernel compat.
Dear Mark,
Here is a patch for you to apply to your ov511-2.28 driver. It's based on the patch made by Vassilli Khachaturov (http://lkml.org/lkml/2005/6/8/242).
This patch basically remove references to the 'id' field from the static struct i2c_client client_template in ovcamchip_core.c, tda7313.c and saa7111-new.c) and update a deprecated function (usb_unlink_urb -> usb_kill_urb).
Tested on ArchLinux 0.7 with kernel v2.6.12 and webcam philips toucam II.
Regards,
Laurent
PS: I haven't subscribed to the linux-kernel mailing list and I would like to be personally CC'ed the answers/comments posted to the list
ov511_core.c +12 -2
@@ -3547,7 +3547,11 @@ ov51x_unlink_isoc(struct usb_ov511 *ov)/* Unschedule all of the iso td's */ for (n =OV511_NUMSBUF -1 ; n >=0 ; n--) {if (ov->sbuf[n].urb) { +#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,12 ) +usb_kill_urb (ov->sbuf[n].urb); +#else usb_unlink_urb (ov->sbuf[n].urb); +#endif usb_free_urb (ov->sbuf[n].urb); ov->sbuf[n].urb =NULL ; }
@@ -4881,12 +4885,18 @@ ov51x_mmap(struct file *file, struct vm_ pos = (unsigned long )ov->fbuf; while (size > 0) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) + page = vmalloc_to_pfn((void *)pos); + if (remap_pfn_range(vma, start, page, PAGE_SIZE, + PAGE_SHARED)) { +#else page = kvirt_to_pa(pos); -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,5 ,3 ) || defined(RH9_REMAP ) +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) || defined(RH9_REMAP) if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) { -#else +# else if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED)) { +# endif #endif up(&ov->lock); return -EAGAIN;
ovcamchip_core.c +2 -0
@@ -582,7 +582,9 @@ static struct i2c_driver driver = {static struct i2c_client client_template = {I2C_DEVNAME ("(unset)" ), +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) .id =-1 , +#endif .driver = &driver, };
ovfx2.c +12 -2
@@ -1678,7 +1678,11 @@ ovfx2_unlink_bulk(struct usb_ovfx2 *ov)/* Unschedule all of the bulk td's */ for (n =OVFX2_NUMSBUF -1 ; n >=0 ; n--) {if (ov->sbuf[n].urb) { +#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,12 )usb_unlink_urb (ov->sbuf[n].urb); +#else +usb_unlink_urb (ov->sbuf[n].urb); +#endif usb_free_urb (ov->sbuf[n].urb); ov->sbuf[n].urb =NULL ; }
@@ -2502,12 +2506,18 @@ ovfx2_mmap(struct file *file, struct vm_ pos = (unsigned long )ov->fbuf; while (size > 0) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) + page = vmalloc_to_pfn((void *)pos); + if (remap_pfn_range(vma, start, page, PAGE_SIZE, + PAGE_SHARED)) { +#else page = kvirt_to_pa(pos); -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,5 ,3 ) || defined(RH9_REMAP ) +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) || defined(RH9_REMAP) if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) { -#else +# else if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED)) { +# endif #endif up(&ov->lock); return -EAGAIN;
saa7111-new.c +2 -0
@@ -520,7 +520,9 @@ static struct i2c_driver driver = {static struct i2c_client client_template = {I2C_DEVNAME ("(unset)" ), +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) .id =-1 , +#endif .driver = &driver };
tda7313.c +2 -0
@@ -202,7 +202,9 @@ static struct i2c_driver driver = {static struct i2c_client client_template = {I2C_DEVNAME ("tda7313" ), +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) .id =-1 , +#endif .driver = &driver, };
Quoted 6 lines · Laurent Meunier
This patch basically remove references to the 'id' field from the static struct
i2c_clientclient_templateinovcamchip_core.c,tda7313.candsaa7111-new.c) and update a deprecated function (usb_unlink_urb->usb_kill_urb).diff -rbup
ov511-2.28-orig/ovfx2.cov511-2.28-new/ovfx2.c
ovfx2.c ovfx2_unlink_bulk(struct usb_ovfx2 *ov) · line 1685
Quoted 8 lines
ovfx2.c +4
-0@@ -1678,7 +1678,11 @@ ovfx2_unlink_bulk(struct usb_ovfx2 *ov)/* Unschedule all of the bulk td's */ for (n =OVFX2_NUMSBUF -1 ; n >=0 ; n--) {if (ov->sbuf[n].urb) { +#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,12 )usb_unlink_urb (ov->sbuf[n].urb); +#else +usb_unlink_urb (ov->sbuf[n].urb); +#endif
This lines look suspicous to me. Do you meant usb_kill_urb in the >= 2.6.12 case?
Gregor
Quoted 11 lines
Review
Quoted 5 lines
(quoted diff) +4
-0+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12) usb_unlink_urb(ov->sbuf[n].urb); +#else + usb_unlink_urb(ov->sbuf[n].urb); +#endifThis lines look suspicous to me. Do you meant
usb_kill_urbin the >= 2.6.12 case?Gregor
Yes, it should be usb_kill_urb in the >= 2.6.12 case. I made a mistake, sorry for that.
ovfx2.c 2005-09-27 20:12:54.000000000 +0200 renamed from ovfx2.c 2004-07-16 01:32:08.000000000 +0200 +4 -0
@@ -1678,7 +1678,11 @@ ovfx2_unlink_bulk(struct usb_ovfx2 *ov) /* Unschedule all of the bulk td's */ for (n = OVFX2_NUMSBUF - 1; n >= 0; n--) { if (ov->sbuf[n].urb) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12) + usb_kill_urb(ov->sbuf[n].urb); +#else usb_unlink_urb(ov->sbuf[n].urb); +#endif
Laurent