rpms/kernel/devel linux-2.6.29-lirc.patch,1.7,1.8

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1432

Modified Files:
	linux-2.6.29-lirc.patch 
Log Message:
minor fixage to lirc_imon alloc failure path

linux-2.6.29-lirc.patch:

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.29-lirc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- linux-2.6.29-lirc.patch	15 Jun 2009 13:53:19 -0000	1.7
+++ linux-2.6.29-lirc.patch	15 Jun 2009 14:25:10 -0000	1.8
@@ -16,7 +16,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_dev.h         |  184 ++++
  drivers/input/lirc/lirc_i2c.c         |  649 +++++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++++
- drivers/input/lirc/lirc_imon.c        | 1941 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 1942 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        |  986 +++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 +++++++++
@@ -30,7 +30,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
  drivers/input/lirc/lirc_zilog.c       | 1385 +++++++++++++++++++++++
- 25 files changed, 15140 insertions(+), 0 deletions(-)
+ 25 files changed, 15141 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 59fd2d1..ad1b16c 100644
@@ -2985,10 +2985,10 @@ index 0000000..ff49bdd
 +
 diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
 new file mode 100644
-index 0000000..adf2c2f
+index 0000000..4d1fc7a
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,1941 @@
+@@ -0,0 +1,1942 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -4340,7 +4340,7 @@ index 0000000..adf2c2f
 +	int len;
 +	struct input_dev *touch = NULL;
 +	int intfnum = 1;
-+	static unsigned char toggle_button[] = { 0x29, 0x91, 0x15, 0xb7 };
++	const unsigned char toggle_button[] = { 0x29, 0x91, 0x15, 0xb7 };
 +
 +	if (!urb)
 +		return;
@@ -4431,8 +4431,8 @@ index 0000000..adf2c2f
 +	struct imon_context *first_if_context = NULL;
 +	int i;
 +	u16 vendor, product;
-+	static unsigned char fp_packet[] = { 0x40, 0x00, 0x00, 0x00,
-+					     0x00, 0x00, 0x00, 0x88 };
++	const unsigned char fp_packet[] = { 0x40, 0x00, 0x00, 0x00,
++					    0x00, 0x00, 0x00, 0x88 };
 +
 +	/*
 +	 * If it's the LCD, as opposed to the VFD, we just need to replace
@@ -4806,6 +4806,7 @@ index 0000000..adf2c2f
 +		context = NULL;
 +	case 1:
 +		retval = -ENOMEM;
++		break;
 +	case 0:
 +		retval = 0;
 +	}