From 710dffbad5ca67add3d90df2df19f5d21deda37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Thu, 21 Mar 2013 02:20:11 +0000
Subject: [PATCH] --- yaml --- r: 361825 b: refs/heads/master c:
 ce16294fda230c787ce5c35f61b2f80d14d70a72 h: refs/heads/master i:   361823:
 ab87829aa0eedc7e452821ec7cf6c74a4caa4e26 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ethernet/ti/cpsw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 398261310079..7acf1b550e14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb0e51d80694fc9964436be1a1a15275e991cb1e
+refs/heads/master: ce16294fda230c787ce5c35f61b2f80d14d70a72
diff --git a/trunk/drivers/net/ethernet/ti/cpsw.c b/trunk/drivers/net/ethernet/ti/cpsw.c
index 75c48558e6fd..df32a090d08e 100644
--- a/trunk/drivers/net/ethernet/ti/cpsw.c
+++ b/trunk/drivers/net/ethernet/ti/cpsw.c
@@ -1364,7 +1364,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 		struct platform_device *mdio;
 
 		parp = of_get_property(slave_node, "phy_id", &lenp);
-		if ((parp == NULL) && (lenp != (sizeof(void *) * 2))) {
+		if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
 			pr_err("Missing slave[%d] phy_id property\n", i);
 			ret = -EINVAL;
 			goto error_ret;