From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1763875AbYF0WJm@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1763875AbYF0WJm (ORCPT <rfc822;w@1wt.eu>);
	Fri, 27 Jun 2008 18:09:42 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758556AbYF0WJ1
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Fri, 27 Jun 2008 18:09:27 -0400
Received: from curtis.curtisfong.org ([66.43.110.51]:58578 "EHLO
	curtis.curtisfong.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757932AbYF0WJ0 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 27 Jun 2008 18:09:26 -0400
Date: Fri, 27 Jun 2008 15:09:23 -0700
From: Nye Liu <nyet@nyet.org>
To: linux-kernel@vger.kernel.org
Cc: pantelis.antoniou@gmail.com, linuxppc-dev@ozlabs.org,
       netdev@vger.kernel.org
Subject: [PATCH] FS_ENET: Don't attempt to set mii_speed when fec_inf is
	null
Message-ID: <20080627220923.GA3126@curtisfong.org>
References: <20080627192651.GA28291@curtisfong.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20080627192651.GA28291@curtisfong.org>
User-Agent: Mutt/1.5.16 (2007-06-11)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Nye Liu <nyet@mrv.com>

When using CONFIG_FIXED_PHY, fec_inf (fep->phydev->bus->priv) is NULL in
fs_enet/mac-fec.c restart(). Dereferencing fec_inf when trying to set the
mii_speed causes a kernel oops.

Signed-off-by: Nye Liu <nyet@mrv.com>

---

diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 8a311d1..7359068 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -328,7 +328,8 @@ static void restart(struct net_device *dev)
 	/*
 	 * Set MII speed.
 	 */
-	FW(fecp, mii_speed, fec_inf->mii_speed);
+	if (fec_inf)
+		FW(fecp, mii_speed, fec_inf->mii_speed);
 
 	/*
 	 * Clear any outstanding interrupt.