From f44b189dbfbad1663f246b6e955876a91e935b23 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 3 May 2011 05:56:23 -0400
Subject: [PATCH] lirc: don't disable in-kernel decoders in devinput mode

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 2 +-
 lirc.spec | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lirc.init b/lirc.init
index c50842b..ab5c833 100755
--- a/lirc.init
+++ b/lirc.init
@@ -79,7 +79,7 @@ start() {
     # we disable the in-kernel decoding when lircd is started up
     # successfully
     if [ $retval -eq 0 ]; then
-        if [ $(echo "$LIRC_DEVICE" | grep -c /dev/lirc) -ge 1 ]; then
+        if [ $(echo "$LIRC_DRIVER" | grep -c "dev.*input") -lt 1 ]; then
             rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
             for rc in $rcs
             do
diff --git a/lirc.spec b/lirc.spec
index d490423..ba067a9 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -297,6 +297,10 @@ fi
 
 
 %changelog
+* Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-2
+- Only disable in-kernel IR decoders if we're not using devinput mode,
+  as they're actually required for devinput mode to work right.
+
 * Sat Mar 26 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-1
 - Update to lirc 0.9.0 release
 - Disable in-kernel IR decoding when starting up lircd, reenable on shutdown