From: chrisw@osdl.org Date: Fri, 11 Mar 2005 16:42:54 +0000 (-0800) Subject: [PATCH] update amd64-oops-on-modprobe.patch from Jean (remove whitespace cleanup) X-Git-Tag: v2.6.11.9~61 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c51e41c035a48ab2da3ca658b09f138de71f77bf;p=thirdparty%2Fkernel%2Fstable-queue.git [PATCH] update amd64-oops-on-modprobe.patch from Jean (remove whitespace cleanup) --- diff --git a/amd64-oops-on-modprobe.patch b/amd64-oops-on-modprobe.patch index b21cc13e0ba..c3fdd0c313f 100644 --- a/amd64-oops-on-modprobe.patch +++ b/amd64-oops-on-modprobe.patch @@ -1,7 +1,8 @@ -Date: Thu, 10 Mar 2005 19:43:42 +0100 +Date: Fri, 11 Mar 2005 10:13:58 +0100 From: Jean Delvare -To: Chris Wright -Cc: Randy Dunlap , stable@kernel.org +To: Greg KH +Cc: stable@kernel.org, Gred Knorr , + linux-kernel@vger.kernel.org, Josh Boyer Subject: [PATCH] fix amd64 2.6.11 oops on modprobe (saa7110) This is a rewrite of the saa7110_write_block function, which was plain @@ -13,17 +14,14 @@ Signed-off-by: Jean Delvare Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman ---- linux-2.6.11-bk3/drivers/media/video/saa7110.c.orig Tue Mar 8 10:27:15 2005 -+++ linux-2.6.11-bk3/drivers/media/video/saa7110.c Tue Mar 8 12:02:45 2005 -@@ -58,10 +58,12 @@ - #define SAA7110_MAX_INPUT 9 /* 6 CVBS, 3 SVHS */ - #define SAA7110_MAX_OUTPUT 0 /* its a decoder only */ +--- linux-2.6.11/drivers/media/video/saa7110.c.orig 2005-03-03 08:01:14.000000000 +0100 ++++ linux-2.6.11/drivers/media/video/saa7110.c 2005-03-11 10:06:09.000000000 +0100 +@@ -60,8 +60,10 @@ --#define I2C_SAA7110 0x9C /* or 0x9E */ -+#define I2C_SAA7110 0x9C /* or 0x9E */ -+ -+#define SAA7110_NR_REG 0x35 + #define I2C_SAA7110 0x9C /* or 0x9E */ ++#define SAA7110_NR_REG 0x35 ++ struct saa7110 { - unsigned char reg[54]; + u8 reg[SAA7110_NR_REG];