From 79e11ac6c00d81315c83d4639e95f1c668257e2a Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Tue, 20 Mar 2012 14:05:40 -0300 Subject: [PATCH] --- yaml --- r: 306137 b: refs/heads/master c: 004ac38859c5bbcc4ffccc37d33be5e467d61c28 h: refs/heads/master i: 306135: bc24095ffefd7b5eb145ea63ff48b279956fead2 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/ir-raw.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 964b2814f28c..8fa9aee94dcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28638601cf2440a7335eb2478b773dcc63e29e7e +refs/heads/master: 004ac38859c5bbcc4ffccc37d33be5e467d61c28 diff --git a/trunk/drivers/media/rc/ir-raw.c b/trunk/drivers/media/rc/ir-raw.c index 95e630998aaf..a82025121345 100644 --- a/trunk/drivers/media/rc/ir-raw.c +++ b/trunk/drivers/media/rc/ir-raw.c @@ -46,9 +46,9 @@ static int ir_raw_event_thread(void *data) while (!kthread_should_stop()) { spin_lock_irq(&raw->lock); - retval = kfifo_out(&raw->kfifo, &ev, sizeof(ev)); + retval = kfifo_len(&raw->kfifo); - if (!retval) { + if (retval < sizeof(ev)) { set_current_state(TASK_INTERRUPTIBLE); if (kthread_should_stop()) @@ -59,11 +59,9 @@ static int ir_raw_event_thread(void *data) continue; } + retval = kfifo_out(&raw->kfifo, &ev, sizeof(ev)); spin_unlock_irq(&raw->lock); - - BUG_ON(retval != sizeof(ev)); - mutex_lock(&ir_raw_handler_lock); list_for_each_entry(handler, &ir_raw_handler_list, list) handler->decode(raw->dev, ev);