From 5e47c78b465e88b51c99ae6be9f26426d9a7f444 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 27 Jun 2012 21:28:14 -0700
Subject: [PATCH] --- yaml --- r: 314690 b: refs/heads/master c:
 160c85f0e050d92c0e42321aab2ffc343594e1c0 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/phy/phy_device.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ba9f6bd70c6..778be816ff35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4fc6918f4b3cc844185f59fc518351525950449
+refs/heads/master: 160c85f0e050d92c0e42321aab2ffc343594e1c0
diff --git a/trunk/drivers/net/phy/phy_device.c b/trunk/drivers/net/phy/phy_device.c
index ef4cdeebedd6..47e02e7dc737 100644
--- a/trunk/drivers/net/phy/phy_device.c
+++ b/trunk/drivers/net/phy/phy_device.c
@@ -327,9 +327,9 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
  */
 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
 {
-	struct phy_device *dev = NULL;
-	u32 phy_id;
 	struct phy_c45_device_ids c45_ids = {0};
+	struct phy_device *dev = NULL;
+	u32 phy_id = 0;
 	int r;
 
 	r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);