Merge commit 'v2.6.37-rc1' into for-2.6.38

[cascardo/linux.git] / drivers / net / ax88796.c

diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 20e946b..b6da4cf 100644 (file)
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -864,6 +864,7 @@ static int ax_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (res == NULL) {
                dev_err(&pdev->dev, "no IRQ specified\n");
+               ret = -ENXIO;
                goto exit_mem;
        }