diff --git a/[refs] b/[refs] index e73ca0780aba..35534d279df5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d51894f4979e941a86309f29898579cbb591514e +refs/heads/master: ced1cbacc0557eda31ab59317c09f774cff865bb diff --git a/trunk/drivers/net/ax88796.c b/trunk/drivers/net/ax88796.c index 4207d6efddc0..9a314d88e7b6 100644 --- a/trunk/drivers/net/ax88796.c +++ b/trunk/drivers/net/ax88796.c @@ -838,12 +838,12 @@ static int ax_probe(struct platform_device *pdev) /* find the platform resources */ - dev->irq = platform_get_irq(pdev, 0); - if (dev->irq < 0) { + ret = platform_get_irq(pdev, 0); + if (ret < 0) { dev_err(&pdev->dev, "no IRQ specified\n"); - ret = -ENXIO; goto exit_mem; } + dev->irq = ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) {