rpms/kernel/F-12 kernel.spec, 1.1859, 1.1860 lirc-2.6.31.patch, 1.3, 1.4

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30142

Modified Files:
	kernel.spec lirc-2.6.31.patch 
Log Message:
* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
- Fix irq status check bugs in lirc_ene0100



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1859
retrieving revision 1.1860
diff -u -p -r1.1859 -r1.1860
--- kernel.spec	12 Oct 2009 14:14:14 -0000	1.1859
+++ kernel.spec	12 Oct 2009 14:51:35 -0000	1.1860
@@ -2049,6 +2049,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
+- Fix irq status check bugs in lirc_ene0100
+
 * Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix 2.6.31 regression that caused device failures with ACPI enabled.
 

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15600 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/lirc-2.6.31.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lirc-2.6.31.patch	3 Sep 2009 21:02:14 -0000	1.3
+++ lirc-2.6.31.patch	12 Oct 2009 14:51:35 -0000	1.4
@@ -1845,7 +1845,7 @@ index 0000000..e84368f
 +	if (dev->hw_revision < ENE_HW_C) {
 +		irq_status = ene_hw_read_reg(dev, ENEB_IRQ_STATUS);
 +
-+		if (!irq_status & ENEB_IRQ_STATUS_IR)
++		if (!(irq_status & ENEB_IRQ_STATUS_IR))
 +			return 0;
 +		ene_hw_write_reg(dev, ENEB_IRQ_STATUS,
 +				 irq_status & ~ENEB_IRQ_STATUS_IR);
@@ -1856,7 +1856,7 @@ index 0000000..e84368f
 +
 +	irq_status = ene_hw_read_reg(dev, ENEC_IRQ);
 +
-+	if (!irq_status && ENEC_IRQ_STATUS)
++	if (!(irq_status & ENEC_IRQ_STATUS))
 +		return 0;
 +
 +	/* original driver does that twice - a workaround ? */