rpms/kernel/F-9 kernel.spec, 1.658, 1.659 linux-2.6-lirc.patch, 1.5, 1.6

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28191

Modified Files:
	kernel.spec linux-2.6-lirc.patch 
Log Message:
* Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com> 2.6.25.4-40
- Fix oops in lirc_i2c module



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- kernel.spec	29 May 2008 18:33:04 -0000	1.658
+++ kernel.spec	2 Jun 2008 19:26:07 -0000	1.659
@@ -1847,6 +1847,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com> 2.6.25.4-40
+- Fix oops in lirc_i2c module
+
 * Thu May 29 2008 John W. Linville <linville at redhat.com> 2.6.25.4-39
 - Upstream wireless fixes from 2008-05-28
   (http://marc.info/?l=linux-wireless&m=121201250110162&w=2)

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-lirc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-lirc.patch	12 Feb 2008 06:18:04 -0000	1.5
+++ linux-2.6-lirc.patch	2 Jun 2008 19:26:07 -0000	1.6
@@ -1,8 +1,8 @@
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
-index 9dea14d..d84ac4a 100644
+index 63512d9..de4b170 100644
 --- a/drivers/input/Kconfig
 +++ b/drivers/input/Kconfig
-@@ -173,5 +173,7 @@ source "drivers/input/gameport/Kconfig"
+@@ -161,5 +161,7 @@ source "drivers/input/gameport/Kconfig"
  
  endmenu
  
@@ -11,16 +11,14 @@
  endmenu
  
 diff --git a/drivers/input/Makefile b/drivers/input/Makefile
-index 2ae87b1..24bdec1 100644
+index 99af903..78b0420 100644
 --- a/drivers/input/Makefile
 +++ b/drivers/input/Makefile
-@@ -21,5 +21,6 @@ obj-$(CONFIG_INPUT_JOYSTICK)	+= joystick/
- obj-$(CONFIG_INPUT_TABLET)	+= tablet/
+@@ -22,3 +22,4 @@ obj-$(CONFIG_INPUT_TABLET)	+= tablet/
  obj-$(CONFIG_INPUT_TOUCHSCREEN)	+= touchscreen/
  obj-$(CONFIG_INPUT_MISC)	+= misc/
-+obj-$(CONFIG_INPUT_LIRC)	+= lirc/
  
- obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
++obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
 index 0000000..138e58a
@@ -4989,10 +4987,10 @@
 +#endif
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
-index 0000000..ed1092b
+index 0000000..6fd8d39
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_i2c.c
-@@ -0,0 +1,671 @@
+@@ -0,0 +1,669 @@
 +/*      $Id$      */
 +
 +/*
@@ -5327,9 +5325,7 @@
 +	int ret;
 +
 +	/* lock bttv in memory while /dev/lirc is in use  */
-+	ret = i2c_use_client(&ir->c);
-+	if (ret != 0)
-+		return ret;
++	i2c_use_client(&ir->c);
 +
 +	MOD_INC_USE_COUNT;
 +	return 0;