Comment 18 for bug 213114

Revision history for this message
Andres Mujica (andres.mujica) wrote :

John, checking your patch and the one at bug #268134, yours seem more clear than the published there.

Would it be possible for you to integrate that patch into yours?

acording to icesheep output the missing part for your patch (and present at the other bug) is:

--- a/qc-usb-old/qc-memory.c
+++ b/qc-usb/qc-memory.c
@@ -81,12 +81,14 @@ static inline int qc_remap_page_range(unsigned long from, unsigned long pfn, uns
 #define pte_offset(pmd,adr) pte_offset_map(pmd,adr) /* Emulation for a kernel using the new rmap-vm */
 #endif /* Fix by Michele Balistreri <email address hidden> */

+#if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,26)
 #ifndef SetPageReserved
 #define SetPageReserved(p) mem_map_reserve(p)
 #endif
 #ifndef ClearPageReserved
 #define ClearPageReserved(p) mem_map_unreserve(p)
 #endif
+#endif

And also this part would be useful

 #endif
@@ -3159,6 +3158,7 @@ PDEBUG("poisoning qc in qc_usb_init");

   /* Register V4L video device */
   memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
+ qc->vdev.parent = &usbdev->dev;

but probably this last part would need a #IFDEF for linux version.

I'm asking this so that bug can be moved to this one, as this one has more chances to get solved for Jaunty and maybe backported to Intrepid.

Thanks in advance.