From patchwork Wed Oct 13 19:19:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 67727 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 38FAA100940 for ; Thu, 14 Oct 2010 06:20:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751592Ab0JMTUL (ORCPT ); Wed, 13 Oct 2010 15:20:11 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:58064 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370Ab0JMTUK (ORCPT ); Wed, 13 Oct 2010 15:20:10 -0400 Received: by wwj40 with SMTP id 40so6929304wwj.1 for ; Wed, 13 Oct 2010 12:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=QnYdv9k+9Vle1i7B1lFbiMCOScGMwVJtVKKiLEvreag=; b=IQ7QGAVO7PxkR238pjGQSnzp0q1bbQO7UU+VEs0WiExLhmlV+yMCEhH0vMbFGuKbVy S98m6V61mz5yZ5vRaQOimTMDWdldBW0klWJ6xnTY+JVKvTSifyKvu4EMZjEGyDHT9uBw XasOtaFPq38qt41hQ8a/NT8WCQVlObR93cTMI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=pIB/44kmrRC4pctHhS7lw2+2ubZJntubn+zuBauKVWjMNpfuH8n8uqVaPFkCBUfqoI LWFmshU2pnW3SpGFd544qZzuX71gYER/WkBPoH4EUB1yo8O9D5R3UuRGGJVHxQ9HNZc3 tK2KwqBkGgUZq1OF3lSJ/+MrJweI888RuHHqE= Received: by 10.227.133.18 with SMTP id d18mr9198165wbt.33.1286997608521; Wed, 13 Oct 2010 12:20:08 -0700 (PDT) Received: from bicker (h3f06.n1.ips.mtn.co.ug [41.210.191.6]) by mx.google.com with ESMTPS id h29sm8606593wbc.15.2010.10.13.12.20.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 Oct 2010 12:20:04 -0700 (PDT) Date: Wed, 13 Oct 2010 21:19:55 +0200 From: Dan Carpenter To: Sandeep Gopalpet Cc: "David S. Miller" , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] gianfar: fix double lock typo Message-ID: <20101013191954.GE6060@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This should be a _restore() instead of a _save(). Signed-off-by: Dan Carpenter --- 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 diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index ae8e5d3..5c566eb 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c @@ -538,7 +538,7 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data) unlock_tx_qs(priv); unlock_rx_qs(priv); - local_irq_save(flags); + local_irq_restore(flags); for (i = 0; i < priv->num_rx_queues; i++) gfar_clean_rx_ring(priv->rx_queue[i],