drivers/net/irda/pxaficp_ir.c: fix error return code

[~andy/linux] / drivers / net / irda / pxaficp_ir.c

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index cb0a5d3c0b641978a69ec7a10310b061a48e53b1..858de05bdb7dc171012374ac02998c1fd111349c 100644 (file)
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -28,7 +28,7 @@
 #include <net/irda/irda_device.h>
 
 #include <mach/dma.h>
-#include <mach/irda.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/regs-ost.h>
 #include <mach/regs-uart.h>
 
@@ -846,8 +846,10 @@ static int pxa_irda_probe(struct platform_device *pdev)
                goto err_mem_2;
 
        dev = alloc_irdadev(sizeof(struct pxa_irda));
-       if (!dev)
+       if (!dev) {
+               err = -ENOMEM;
                goto err_mem_3;
+       }
 
        SET_NETDEV_DEV(dev, &pdev->dev);
        si = netdev_priv(dev);