From d400919a858a8c907ae88b9c8041b8d4a32c1b97 Mon Sep 17 00:00:00 2001 From: Ken Kawasaki Date: Mon, 28 Dec 2009 15:17:24 +0000 Subject: [PATCH] --- yaml --- r: 183419 b: refs/heads/master c: ceba0b29e002e6151b6b5ead8db9c664b58d8d21 h: refs/heads/master i: 183417: 38c36028042e649f0a6c4d447a7ce1195b6a6dbc 183415: c827cf31787ac26b249a30e0f5587b65b32620a6 v: v3 --- [refs] | 2 +- trunk/drivers/net/pcmcia/axnet_cs.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bd4f43261dfb..519037326a91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee983ac76865797a5553597a9412c835c2710f51 +refs/heads/master: ceba0b29e002e6151b6b5ead8db9c664b58d8d21 diff --git a/trunk/drivers/net/pcmcia/axnet_cs.c b/trunk/drivers/net/pcmcia/axnet_cs.c index d431b59e7d11..2ee57bd52a01 100644 --- a/trunk/drivers/net/pcmcia/axnet_cs.c +++ b/trunk/drivers/net/pcmcia/axnet_cs.c @@ -1065,14 +1065,11 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb, spin_lock_irqsave(&ei_local->page_lock, flags); outb_p(0x00, e8390_base + EN0_IMR); - spin_unlock_irqrestore(&ei_local->page_lock, flags); /* * Slow phase with lock held. */ - spin_lock_irqsave(&ei_local->page_lock, flags); - ei_local->irqlock = 1; send_length = max(length, ETH_ZLEN);