diff --git a/[refs] b/[refs] index 1dccaed15f18..5dd5d8096409 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd4d8ca6446538a904127838cb6c9a4cffe690f7 +refs/heads/master: ce105a082371570effb71541f299b1dc2771ee03 diff --git a/trunk/drivers/net/pcnet32.c b/trunk/drivers/net/pcnet32.c index e5e8c59243b6..1c35e1d637a0 100644 --- a/trunk/drivers/net/pcnet32.c +++ b/trunk/drivers/net/pcnet32.c @@ -1405,7 +1405,7 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) /* Set interrupt enable. */ lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN); - mmiowb(); + spin_unlock_irqrestore(&lp->lock, flags); } return work_done; @@ -2597,7 +2597,7 @@ pcnet32_interrupt(int irq, void *dev_id) val = lp->a.read_csr(ioaddr, CSR3); val |= 0x5f00; lp->a.write_csr(ioaddr, CSR3, val); - mmiowb(); + __napi_schedule(&lp->napi); break; }