From 566fe096ae3f24a4f9ac06942b1f85de0e248286 Mon Sep 17 00:00:00 2001 From: roel kluin Date: Tue, 21 Oct 2008 01:44:02 -0400 Subject: [PATCH] --- yaml --- r: 117775 b: refs/heads/master c: ced1cbacc0557eda31ab59317c09f774cff865bb h: refs/heads/master i: 117773: 9c8b5a99108cd7fb6ff23eacb7472ef859e907ed 117771: 2fbc1b019de7b31c4ba056d0de69dfb8b6518074 117767: 88973d436f3bcaf3a2a5c574b2daa47349ac203c 117759: 4a083c3466eda6a0d3de979cd17c9c1a784c8d83 v: v3 --- [refs] | 2 +- trunk/drivers/net/ax88796.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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) {