From patchwork Sat Feb 28 03:58:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo-Fu Tseng X-Patchwork-Id: 23869 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 00851DDDFF for ; Sat, 28 Feb 2009 14:59:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754206AbZB1D7V (ORCPT ); Fri, 27 Feb 2009 22:59:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754179AbZB1D7V (ORCPT ); Fri, 27 Feb 2009 22:59:21 -0500 Received: from cooldavid.org ([220.133.139.86]:46801 "EHLO cooldavid.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754167AbZB1D7U (ORCPT ); Fri, 27 Feb 2009 22:59:20 -0500 Received: from cooldavid.org (localhost [127.0.0.1]) by cooldavid.org (Postfix) with ESMTP id 590D4EE19; Sat, 28 Feb 2009 11:58:16 +0800 (CST) From: "Guo-Fu Tseng" To: Jeff Garzik , David Miller Cc: netdev@vger.kernel.org, Ethan Reply-To: cooldavid@cooldavid.org Subject: [PATCH net-next-2.6 3/4] jme: Clear all modified GHC register flags Date: Sat, 28 Feb 2009 11:58:16 +0800 Message-Id: <20090228035818.M14206@cooldavid.org> In-Reply-To: <20081008215853.M53590@cooldavid.org> References: <20080915165101.M68109@cooldavid.org> <48D27CDA.50501@pobox.com> <20081008215853.M53590@cooldavid.org> X-Mailer: Open WebMail 2.51 20050228 X-OriginatingIP: 140.117.176.176 (cooldavid) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Clear all modified GHC register flags. Fixed-by: Ethan Hsiao Signed-off-by: Guo-Fu Tseng --- 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/jme.c b/drivers/net/jme.c index f65a09c..47dd47f 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -429,10 +429,9 @@ jme_check_link(struct net_device *netdev, int testonly) jme->phylink = phylink; - ghc = jme->reg_ghc & ~(GHC_SPEED_10M | - GHC_SPEED_100M | - GHC_SPEED_1000M | - GHC_DPX); + ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX | + GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE | + GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY); switch (phylink & PHY_LINK_SPEED_MASK) { case PHY_LINK_SPEED_10M: ghc |= GHC_SPEED_10M |