diff --git a/[refs] b/[refs] index f34cd2a3965c..2003127d7652 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7264fcd129b939fc1faa8ccfee043f843285161b +refs/heads/master: b4c84c298bd3a2383dadceb64d2b5f23dc2adc61 diff --git a/trunk/drivers/staging/et131x/et131x_isr.c b/trunk/drivers/staging/et131x/et131x_isr.c index cb7f6775ce0a..36f68fe3e8c9 100644 --- a/trunk/drivers/staging/et131x/et131x_isr.c +++ b/trunk/drivers/staging/et131x/et131x_isr.c @@ -253,14 +253,12 @@ void et131x_isr_handler(struct work_struct *work) * exit. */ /* Handle all the completed Transmit interrupts */ - if (status & ET_INTR_TXDMA_ISR) { + if (status & ET_INTR_TXDMA_ISR) et131x_handle_send_interrupt(etdev); - } /* Handle all the completed Receives interrupts */ - if (status & ET_INTR_RXDMA_XFR_DONE) { + if (status & ET_INTR_RXDMA_XFR_DONE) et131x_handle_recv_interrupt(etdev); - } status &= 0xffffffd7;