From d28da870f6d97beca349467383378b62271f489e Mon Sep 17 00:00:00 2001 From: Brian Hill Date: Wed, 26 May 2010 20:42:18 -0700 Subject: [PATCH] --- yaml --- r: 199195 b: refs/heads/master c: 755fae0ac41672523a3ac00d41fe9bac226b0578 h: refs/heads/master i: 199193: a070b62aaabe353a52a693aca7f7e58810ee3d12 199191: 40350a38aa5cda6e0acc5dd89c6ddc5582ddddad v: v3 --- [refs] | 2 +- trunk/drivers/net/ll_temac_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9eabc756ad7a..d138b521d2e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff937938e7781b2c1bffce0a5400af308e3946d5 +refs/heads/master: 755fae0ac41672523a3ac00d41fe9bac226b0578 diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c index b59b24d667f0..1bb6e605f64f 100644 --- a/trunk/drivers/net/ll_temac_main.c +++ b/trunk/drivers/net/ll_temac_main.c @@ -950,7 +950,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) lp->rx_irq = irq_of_parse_and_map(np, 0); lp->tx_irq = irq_of_parse_and_map(np, 1); - if (!lp->rx_irq || !lp->tx_irq) { + if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) { dev_err(&op->dev, "could not determine irqs\n"); rc = -ENOMEM; goto nodev;