aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-picolcd_core.c
diff options
context:
space:
mode:
authorBruno Prémont <bonbons@linux-vserver.org>2012-08-19 13:32:54 -0400
committerJiri Kosina <jkosina@suse.cz>2012-09-05 05:48:07 -0400
commitae08e324146c89f1059e9d3c3898d0260a988795 (patch)
treecc7df091c897f3f97127f08ed19cd70cc2bf97eb /drivers/hid/hid-picolcd_core.c
parent16048709b2f6a7e721ac677f9a6741ac1c13ffd7 (diff)
HID: picoLCD: Add support for CIR
Implement support for picoLCD's CIR header using RC_CORE for decoding the IR event stream. Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-picolcd_core.c')
-rw-r--r--drivers/hid/hid-picolcd_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c
index e4fe342e7aa..0d0c798e3ee 100644
--- a/drivers/hid/hid-picolcd_core.c
+++ b/drivers/hid/hid-picolcd_core.c
@@ -356,8 +356,7 @@ static int picolcd_raw_event(struct hid_device *hdev,
356 if (data->input_keys) 356 if (data->input_keys)
357 ret = picolcd_raw_keypad(data, report, raw_data+1, size-1); 357 ret = picolcd_raw_keypad(data, report, raw_data+1, size-1);
358 } else if (report->id == REPORT_IR_DATA) { 358 } else if (report->id == REPORT_IR_DATA) {
359 if (data->input_cir) 359 ret = picolcd_raw_cir(data, report, raw_data+1, size-1);
360 ret = picolcd_raw_cir(data, report, raw_data+1, size-1);
361 } else { 360 } else {
362 spin_lock_irqsave(&data->lock, flags); 361 spin_lock_irqsave(&data->lock, flags);
363 /* 362 /*