---

yaml --- r: 279039 b: refs/heads/master c: 4e68ea2 h: refs/heads/master i: 279037: 6697331 279035: 1e01680 279031: 70e0a54 279023: 0cfcf1d 279007: 47bcdd3 278975: 7018796 278911: 84243d6 278783: 3d427f8 278527: 60182f3 v: v3
git-mirror · Dec 21, 2011 · f957972 · f957972
1 parent 2acdc7f
commit f957972
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;
 	}