From patchwork Sat Aug 29 13:10:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 32500 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id A2B13B708B for ; Sat, 29 Aug 2009 23:14:40 +1000 (EST) Received: by ozlabs.org (Postfix) id 93BE9DDD0C; Sat, 29 Aug 2009 23:14:40 +1000 (EST) 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 2F903DDD0B for ; Sat, 29 Aug 2009 23:14:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751550AbZH2NOb (ORCPT ); Sat, 29 Aug 2009 09:14:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751489AbZH2NOb (ORCPT ); Sat, 29 Aug 2009 09:14:31 -0400 Received: from mail-iw0-f204.google.com ([209.85.223.204]:41517 "EHLO mail-iw0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436AbZH2NOa (ORCPT ); Sat, 29 Aug 2009 09:14:30 -0400 Received: by iwn42 with SMTP id 42so1232737iwn.33 for ; Sat, 29 Aug 2009 06:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=kBkitWvDkHfozGRgKm4Nj0JWx1qeSqCC2Zawe+c0/t4=; b=jXkjCXZtZjX3V+cfGZJUMSICf8nthU9VGkXnjGgKgArpOIch1M9pPNsBD5j2z7/b/1 J5PRUNx5P6rJf3zMomvRcnbC2urqwWmumPaGWL45JckBnoNeqR+dVCazXpVs/DUe3gga ahCBlHqOXpSUiBnQCrfszqlOxX9Zrarw3vQaM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=ZJTbAEHZ2b0AIofSyS6PnSw8w4pv4JagiQK3eHgIK6YtLBGQUkJwozp9oUWGjcCFDM 7uTbiLIaXMpveteP5JzqpD0Y42i5RPUGKnpJEVgodFueHJcMbcS+yDKBmVZJmnRoVQgp qCOqz7yR/K/XnSi0Je04RrPpmESzueWoyrK6s= Received: by 10.231.8.87 with SMTP id g23mr2130443ibg.55.1251551672734; Sat, 29 Aug 2009 06:14:32 -0700 (PDT) Received: from ?192.168.0.100? ([121.168.21.96]) by mx.google.com with ESMTPS id 22sm1325892pzk.2.2009.08.29.06.14.29 (version=SSLv3 cipher=RC4-MD5); Sat, 29 Aug 2009 06:14:31 -0700 (PDT) Message-ID: <4A9928C9.7000907@ring3k.org> Date: Sat, 29 Aug 2009 22:10:33 +0900 From: Mike McCormack User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706) MIME-Version: 1.0 To: Stephen Hemminger CC: netdev@vger.kernel.org, Rene Mayrhofer , Richard Leitner Subject: [PATCH] sky2: Don't try to turn led off in sky2_down() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are a few problems with the following line of code in sky2_down() sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); * It doesn't specify which port's LED to turn off. * We don't turn send LED_STAT_ON on in sky2_up() * B0_LED is 0x0006 in the vendor driver, but 0x0005 in sky2. B0_LED is right next to B0_POWER_CTRL, so this is possibly accounts for the device being accidently powered down as reported by Rene Mayrhofer. Signed-off-by: Mike McCormack --- drivers/net/sky2.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index dd630cf..aec8ad3 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1866,9 +1866,6 @@ static int sky2_down(struct net_device *dev) sky2_phy_power_down(hw, port); spin_unlock_bh(&sky2->phy_lock); - /* turn off LED's */ - sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); - sky2_tx_reset(hw, port); /* Free any pending frames stuck in HW queue */