From 6ad25b29f3bd1f43effc943c4a248d64a9352b32 Mon Sep 17 00:00:00 2001
From: Mark Einon <mark.einon@gmail.com>
Date: Tue, 23 Aug 2011 23:40:33 +0100
Subject: [PATCH] --- yaml --- r: 267631 b: refs/heads/master c:
 1c863c8bcb653be8e2b17b49b24f752392746ee2 h: refs/heads/master i:   267629:
 4b80995b072e2bddb3c7f6c2ffcfcbe3fbe40e64   267627:
 4effcb2db26ff15930a8938ebc5c52331380c187   267623:
 04d8fad569558ce189b2850ca8cf36d1c6f6faf6   267615:
 5694dc363e9a6636a00a954e0d06a5226f65dd04 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/et131x/et1310_phy.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c852be374699..9d8f5e0aebd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbbb24947e1bea5e6034ae2edfbf1be5b8f2b062
+refs/heads/master: 1c863c8bcb653be8e2b17b49b24f752392746ee2
diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c
index 2385d04e7487..36534260fae1 100644
--- a/trunk/drivers/staging/et131x/et1310_phy.c
+++ b/trunk/drivers/staging/et131x/et1310_phy.c
@@ -908,9 +908,6 @@ void et1310_phy_init(struct et131x_adapter *etdev)
 {
 	u16 data, index;
 
-	if (etdev == NULL)
-		return;
-
 	/* get the identity (again ?) */
 	et131x_mii_read(etdev, PHY_ID_1, &data);
 	et131x_mii_read(etdev, PHY_ID_2, &data);