From 9e8ab8c862e1cedf85b636e116315a9b81cee18a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 7 Sep 2012 09:47:41 +0300
Subject: [PATCH] --- yaml --- r: 323452 b: refs/heads/master c:
 02d9be1aa6e93f4819f230a1d570e2ff415fa294 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/hid/hid-picolcd_cir.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cbd56a021ceb..06ae3642a65f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb9001cd8ffff9c9b1ed1ea85d36c862bea964c0
+refs/heads/master: 02d9be1aa6e93f4819f230a1d570e2ff415fa294
diff --git a/trunk/drivers/hid/hid-picolcd_cir.c b/trunk/drivers/hid/hid-picolcd_cir.c
index 14c5ce0e71bc..13ca9191b630 100644
--- a/trunk/drivers/hid/hid-picolcd_cir.c
+++ b/trunk/drivers/hid/hid-picolcd_cir.c
@@ -51,7 +51,7 @@ int picolcd_raw_cir(struct picolcd_data *data,
 
 	/* ignore if rc_dev is NULL or status is shunned */
 	spin_lock_irqsave(&data->lock, flags);
-	if (data->rc_dev && (data->status & PICOLCD_CIR_SHUN)) {
+	if (!data->rc_dev || (data->status & PICOLCD_CIR_SHUN)) {
 		spin_unlock_irqrestore(&data->lock, flags);
 		return 1;
 	}