From patchwork Sun Dec 13 00:44:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Kawasaki X-Patchwork-Id: 40994 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F233BB6EF3 for ; Sun, 13 Dec 2009 12:19:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932316AbZLMBPp (ORCPT ); Sat, 12 Dec 2009 20:15:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932188AbZLMBPp (ORCPT ); Sat, 12 Dec 2009 20:15:45 -0500 Received: from defg500.nifty.com ([202.248.238.127]:25212 "HELO defg500.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932206AbZLMBPm (ORCPT ); Sat, 12 Dec 2009 20:15:42 -0500 X-Greylist: delayed 321 seconds by postgrey-1.27 at vger.kernel.org; Sat, 12 Dec 2009 20:15:42 EST Received: from userg508.nifty.com (userg508p.nifty.com [172.22.128.88])by defg500.nifty.com with ESMTP id nBD0j5sP016168 for ; Sun, 13 Dec 2009 09:45:05 +0900 Received: from localhost.localdomain (eaoska169002.adsl.ppp.infoweb.ne.jp [219.116.18.2])by userg508.nifty.com with SMTP id nBD0iC2Y009800 for ; Sun, 13 Dec 2009 09:44:12 +0900 X-Nifty-SrcIP: [219.116.18.2] Date: Sun, 13 Dec 2009 09:44:11 +0900 From: Ken Kawasaki To: netdev@vger.kernel.org Subject: [PATCH kernel 2.6.32-git7] 3c574_cs: disable irq before calling el3_interrupt Message-Id: <20091213094411.18be2ff6.ken_kawasaki@spring.nifty.jp> In-Reply-To: <20090913172257.6c1976ec.ken_kawasaki@spring.nifty.jp> References: <20090405094907.5f6a5fea.ken_kawasaki@spring.nifty.jp> <20090419084444.4ee7ddee.ken_kawasaki@spring.nifty.jp> <20090426162929.3d036f26.ken_kawasaki@spring.nifty.jp> <20090913172257.6c1976ec.ken_kawasaki@spring.nifty.jp> X-Mailer: Sylpheed 2.3.1 (GTK+ 2.10.11; i386-redhat-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 3c574_cs, 3c589_cs: disable irq before calling el3_interrupt in the media_check function. Signed-off-by: Ken Kawasaki --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.32-git7/drivers/net/pcmcia/3c574_cs.c.orig 2009-12-12 06:58:14.000000000 +0900 +++ linux-2.6.32-git7/drivers/net/pcmcia/3c574_cs.c 2009-12-13 08:50:18.000000000 +0900 @@ -912,7 +912,11 @@ static void media_check(unsigned long ar if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) { if (!lp->fast_poll) printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); + + local_irq_save(flags); el3_interrupt(dev->irq, dev); + local_irq_restore(flags); + lp->fast_poll = HZ; } if (lp->fast_poll) { --- linux-2.6.32-git7/drivers/net/pcmcia/3c589_cs.c.orig 2009-12-12 06:58:28.000000000 +0900 +++ linux-2.6.32-git7/drivers/net/pcmcia/3c589_cs.c 2009-12-13 08:50:38.000000000 +0900 @@ -711,7 +711,11 @@ static void media_check(unsigned long ar (inb(ioaddr + EL3_TIMER) == 0xff)) { if (!lp->fast_poll) printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name); + + local_irq_save(flags); el3_interrupt(dev->irq, dev); + local_irq_restore(flags); + lp->fast_poll = HZ; } if (lp->fast_poll) {