Motion Eye camera driver updates.
PATCH 1/1 Motion Eye camera driver updates.
This patch applies cleanly to either 2.4.8-pre1 or 2.4.7-ac1 and updates the motion eye camera driver to remove an array from the stack, and slightly optimize the code.
All the credit goes to Hugh Dickins <[email protected]>.
Alan, Linus, please apply.
Stelian.
drivers/media/video/meye.c +7 -12
@@ -209,28 +209,23 @@/* return a page table pointing to N pages of locked memory */ static void *ptable_alloc (int npages,u32 *pt_addr) { -int i =0 ; +int i;void *vmem; -u32 ptable[npages+1 ]; -signed long size; +u32 *ptable;unsigned long adr; - size = (npages +1 ) *PAGE_SIZE ; - vmem =rvmalloc (size); + vmem =rvmalloc ((npages +1 ) *PAGE_SIZE );if (!vmem)return NULL ; -memset (ptable,0 ,sizeof (ptable)); adr = (unsigned long )vmem; -while (size >0 ) { - ptable[i++] =virt_to_bus (__va (kvirt_to_pa (adr))); + ptable = (u32 *)(vmem + npages *PAGE_SIZE ); +for (i =0 ; i < npages; i++) { + ptable[i] = (u32 )kvirt_to_bus (adr); adr +=PAGE_SIZE ; - size -=PAGE_SIZE ; } -memcpy (vmem + npages *PAGE_SIZE , ptable,PAGE_SIZE ); - *pt_addr = ptable[npages]; - + *pt_addr = (u32 )kvirt_to_bus (adr);return vmem; }
drivers/media/video/meye.h +1 -1
@@ -29,7 +29,7 @@#define _MEYE_PRIV_H_#define MEYE_DRIVER_MAJORVERSION 1 -#define MEYE_DRIVER_MINORVERSION 0 +#define MEYE_DRIVER_MINORVERSION 1/****************************************************************************/ /* Motion JPEG chip registers */
Signature · 4 lines
Stelian Pop <[email protected]> |---------------- Free Software Engineer -----------------| | Alcôve - http://www.alcove.com - Tel: +33 1 49 22 68 00 | |------------- Alcôve, liberating software ---------------|