From f9579729c9473f0eafa640c9380f8dc93cb61284 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Wed, 21 Dec 2011 15:42:50 -0500
Subject: [PATCH] --- yaml --- r: 279039 b: refs/heads/master c:
 4e68ea26e76273cc62a981a414a8319a7f4c1077 h: refs/heads/master i:   279037:
 669733197d702ffb1a31a439156c1810e0718353   279035:
 1e016809a707fe254e17ec56a745d2de6dcd2fdb   279031:
 70e0a5464485dfa6ba8b248a1a06c86922fa332c   279023:
 0cfcf1da0ee81b02d54bc4d3a142cd429a2dfb94   279007:
 47bcdd345fa1617699572abab89687d099ff0f0c   278975:
 7018796754908e36d07017cec9e7a3f26d571d4f   278911:
 84243d682dd8bad0daa7b0e99906655edca72e17   278783:
 3d427f85c401b0b823acfe8da78fc0bc66513b3f   278527:
 60182f3596b168f0a8302e7ae396a910783dc901 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/ethernet/xilinx/ll_temac_main.c   | 2 +-
 trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2dc215e108b7..0aff9e4bc570 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab56222a32b9dbaae19c1d37f07b0ac4fc3c27ec
+refs/heads/master: 4e68ea26e76273cc62a981a414a8319a7f4c1077
diff --git a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c b/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c
index 903a77b416df..f21addb1db95 100644
--- a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1091,7 +1091,7 @@ static int __devinit temac_of_probe(struct platform_device *op)
 
 	of_node_put(np); /* Finished with the DMA node; drop the reference */
 
-	if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
+	if (!lp->rx_irq || !lp->tx_irq) {
 		dev_err(&op->dev, "could not determine irqs\n");
 		rc = -ENOMEM;
 		goto err_iounmap_2;
diff --git a/trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 7f9f6e3a4c43..79013e5731a5 100644
--- a/trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1129,7 +1129,7 @@ static int __devinit xemaclite_of_probe(struct platform_device *ofdev)
 
 	/* Get IRQ for the device */
 	rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq);
-	if (rc == NO_IRQ) {
+	if (!rc) {
 		dev_err(dev, "no IRQ found\n");
 		return rc;
 	}