I don't have my kernel tree with me (I'm at vacation atm.). The patch
is made with only the -uN options, but I can make a new one on Friday
(if needed).
Thanks for the help!
On Mon, Jul 20, 2009 at 21:49, <bugzilla-daemon@xxxxxxxxxxxxxxxxxxx> wrote:
> http://bugzilla.kernel.org/show_bug.cgi?id=13708
>
>
> Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> changed:
>
> What |Removed |Added
> ----------------------------------------------------------------------------
> CC| |akpm@xxxxxxxxxxxxxxxxxxxx
>
>
>
>
> --- Comment #2 from Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> 2009-07-20 19:49:22 ---
> It's quite painful to handle patches via bugzilla. Could you resend it via
> email please? Documentation/SubmittingPatches has some details.
>
> Suitable recipients are
>
> Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
> Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> linux-media@xxxxxxxxxxxxxxx
>
> Thanks.
>
> --
> Configure bugmail: http://bugzilla.kernel.org/userprefs.cgi?tab=email
> ------- You are receiving this mail because: -------
> You reported the bug.
>
--- zr364xx-nemmux-de-uj-2.6.30-upgrade-utan-20090704.c 2009-07-04 23:29:51.000000000 +0200
+++ zr364xx-nemmux-de-uj-2.6.30-upgrade-elott-20090627.c 2009-06-27 14:37:51.000000000 +0200
@@ -59,6 +59,7 @@
#define METHOD0 0
#define METHOD1 1
#define METHOD2 2
+#define METHOD3 3
/* Module parameters */
@@ -95,7 +96,7 @@
{USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 },
{USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 },
{USB_DEVICE(0x041e, 0x405d), .driver_info = METHOD2 },
- {USB_DEVICE(0x08ca, 0x2102), .driver_info = METHOD2 },
+ {USB_DEVICE(0x08ca, 0x2102), .driver_info = METHOD3 },
{} /* Terminating entry */
};
@@ -213,7 +214,7 @@
};
/* init table */
-static message *init[3] = { m0, m1, m2 };
+static message *init[4] = { m0, m1, m2, m2 };
/* JPEG static data in header (Huffman table, etc) */
@@ -347,6 +348,11 @@
cam->buffer[3], cam->buffer[4], cam->buffer[5],
cam->buffer[6], cam->buffer[7], cam->buffer[8]);
} else {
+ if (ptr + actual_length - jpeg > MAX_FRAME_SIZE)
+ {
+ DBG("frame too big!");
+ return 0;
+ }
memcpy(ptr, cam->buffer, actual_length);
ptr += actual_length;
}
@@ -847,6 +853,22 @@
m0d1[0] = mode;
m1[2].value = 0xf000 + mode;
m2[1].value = 0xf000 + mode;
+
+ /* special case for METHOD3, the modes are different */
+ if (cam->method == METHOD3) {
+ switch (mode) {
+ case 1:
+ m2[1].value = 0xf000 + 4;
+ break;
+ case 2:
+ m2[1].value = 0xf000 + 0;
+ break;
+ default:
+ m2[1].value = 0xf000 + 1;
+ break;
+ }
+ }
+
header2[437] = cam->height / 256;
header2[438] = cam->height % 256;
header2[439] = cam->width / 256;
