Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 002a442bf73f..858de05bdb7d 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -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);