Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / drivers / net / ethernet / tile / tilegx.c

diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index 5eca9bb185a0a9fede62bc406aa4abfadf08d2c7..14389f841d431c1236f5ea90d0d3eb995a41c39c 100644 (file)
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -1208,8 +1208,8 @@ static int tile_net_setup_interrupts(struct net_device *dev)
 
        irq = md->ingress_irq;
        if (irq < 0) {
-               irq = create_irq();
-               if (irq < 0) {
+               irq = irq_alloc_hwirq(-1);
+               if (!irq) {
                        netdev_err(dev,
                                   "create_irq failed: mpipe[%d] %d\n",
                                   instance, irq);
@@ -1223,7 +1223,7 @@ static int tile_net_setup_interrupts(struct net_device *dev)
                if (rc != 0) {
                        netdev_err(dev, "request_irq failed: mpipe[%d] %d\n",
                                   instance, rc);
-                       destroy_irq(irq);
+                       irq_free_hwirq(irq);
                        return rc;
                }
                md->ingress_irq = irq;