From patchwork Tue Feb 17 06:19:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 23241 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 EFC42DDD0C for ; Tue, 17 Feb 2009 17:19:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751229AbZBQGTw (ORCPT ); Tue, 17 Feb 2009 01:19:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751131AbZBQGTt (ORCPT ); Tue, 17 Feb 2009 01:19:49 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:53292 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751100AbZBQGTo (ORCPT ); Tue, 17 Feb 2009 01:19:44 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id E318A17015D; Tue, 17 Feb 2009 14:25:52 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n1H6JijH001300; Tue, 17 Feb 2009 14:19:44 +0800 Received: from [127.0.0.1] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 0D83FD44AF; Tue, 17 Feb 2009 14:18:58 +0800 (CST) Message-ID: <499A56EC.2020106@cn.fujitsu.com> Date: Tue, 17 Feb 2009 14:19:24 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Michael Chan , netdev@vger.kernel.org Subject: [PATCH] tg3: fix typo && -> || in drivers/net/tg3.c Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the typo && -> || Signed-off-by: Wei Yongjun --- drivers/net/tg3.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 4595962..b080f94 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -2237,8 +2237,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) phyid = phydev->drv->phy_id & phydev->drv->phy_id_mask; if (phyid != TG3_PHY_ID_BCMAC131) { phyid &= TG3_PHY_OUI_MASK; - if (phyid == TG3_PHY_OUI_1 && - phyid == TG3_PHY_OUI_2 && + if (phyid == TG3_PHY_OUI_1 || + phyid == TG3_PHY_OUI_2 || phyid == TG3_PHY_OUI_3) do_low_power = true; }