[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  624f30bbf6a98e2b883a1aac72ca25098a67ef97 (commit)
      from  d7c0b0aba14caaced017bc5520d48f5ddb5ac488 (commit)

Summary of changes:
 drivers/dahdi/wctc4xxp/base.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 624f30bbf6a98e2b883a1aac72ca25098a67ef97
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Mon Jun 2 06:08:08 2014 -0500

    wctc4xxp: Trivial fix typo that was preventing firmware load.
    
    The interrupt handler was not schedulding the deferred processing routine when
    there was packets to process. I did not test the actual master branch after
    editing for checkpatch compliance. Sorry.
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
index 68d1f4a..d489f50 100644
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -2732,12 +2732,9 @@ DAHDI_IRQ_HANDLER(wctc4xxp_interrupt)
 	/* Clear all the pending interrupts. */
 	__wctc4xxp_setctl(wc, 0x0028, ints);
 
-	if (likely(ints & NORMAL_INTERRUPTS)) {
-
-		if (ints & (RX_COMPLETE_INTERRUPT | TIMER_INTERRUPT)) {
-			packets_to_process = !wctc4xxp_handle_receive_ring(wc);
-			service_tx_ring(wc);
-		}
+	if (ints & (RX_COMPLETE_INTERRUPT | TIMER_INTERRUPT)) {
+		packets_to_process = wctc4xxp_handle_receive_ring(wc) > 0;
+		service_tx_ring(wc);
 
 #if DEFERRED_PROCESSING == WORKQUEUE
 		if (packets_to_process)

-----------------------------------------------------------------------


-- 
dahdi/linux.git