From patchwork Thu Apr 28 17:41:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Jaremko X-Patchwork-Id: 93268 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 5EC101007D8 for ; Fri, 29 Apr 2011 03:41:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755793Ab1D1Rlo (ORCPT ); Thu, 28 Apr 2011 13:41:44 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:42747 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752026Ab1D1Rln (ORCPT ); Thu, 28 Apr 2011 13:41:43 -0400 Received: by ywj3 with SMTP id 3so1050321ywj.19 for ; Thu, 28 Apr 2011 10:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:cc:in-reply-to:references :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=hX/Q6SvdZl4yXKeAnwleYubOL+D6VNDMApgQf15T8Ek=; b=itTIQyYuJ4dK2P7GSrTw7TkBA8STp0WWMuhM/91haudS0NVrwB1HLFRKpih0Xz4x7f xMB4fLDs4F50lJVjVgM0FMjhou8LpKV6DKaMiHYBU91iUXX87ZflDVKFRKsWYSg6SENT jsTmB87h3rKRJbgGItJjdcvbls65M599Q8uVg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=GgsgrDGWC+b7nI03xYW7vdFiewmbtn/wf2S9NOV13CnlLp+c87GI+f2TRTCNYgyoD2 EdJM9f4O4d1H1znGf+IyukPWbEoF1gtMefAloR0PVUufBMY55Pu7bA5EoP9AwhNuUNr/ 9IqjNV0b8JeSielFVj+9pX3Zr1xKdYC0rVPKA= Received: by 10.236.115.3 with SMTP id d3mr4670865yhh.359.1304012502125; Thu, 28 Apr 2011 10:41:42 -0700 (PDT) Received: from [192.168.1.152] ([216.191.205.183]) by mx.google.com with ESMTPS id u29sm963051yhn.70.2011.04.28.10.41.40 (version=SSLv3 cipher=OTHER); Thu, 28 Apr 2011 10:41:41 -0700 (PDT) Subject: [PATCH v2] net: ftmac100: fix scheduling while atomic during PHY link status change From: Adam Jaremko To: Po-Yu Chuang Cc: Ratbert Po-Yu =?UTF-8?Q?Chuang=28=E8=8E=8A=E5=8D=9A=E5=AE=87=29?= , netdev@vger.kernel.org, David Miller , Eric Dumazet In-Reply-To: References: Date: Thu, 28 Apr 2011 13:41:18 -0400 Message-ID: <1304012478.3715.5.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 (2.32.2-1.fc14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I think I've sorted my mail client preferences and all should be well now. Signed-off-by: Adam Jaremko Acked-by: Po-Yu Chuang --- drivers/net/ftmac100.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index a316619..9bd7746 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -139,11 +139,11 @@ static int ftmac100_reset(struct ftmac100 *priv) * that hardware reset completed (what the f*ck). * We still need to wait for a while. */ - usleep_range(500, 1000); + udelay(500); return 0; } - usleep_range(1000, 10000); + udelay(1000); } netdev_err(netdev, "software reset failed\n"); @@ -772,7 +772,7 @@ static int ftmac100_mdio_read(struct net_device *netdev, int phy_id, int reg) if ((phycr & FTMAC100_PHYCR_MIIRD) == 0) return phycr & FTMAC100_PHYCR_MIIRDATA; - usleep_range(100, 1000); + udelay(100); } netdev_err(netdev, "mdio read timed out\n"); @@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device *netdev, int phy_id, int reg, if ((phycr & FTMAC100_PHYCR_MIIWR) == 0) return; - usleep_range(100, 1000); + udelay(100); } netdev_err(netdev, "mdio write timed out\n");