6 files changed, 17 insertions, 8 deletions

diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 30087ca23a0f..6e4d4b62c9a8 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -459,8 +459,10 @@ static int irtty_open(struct tty_struct *tty)
 
         /* allocate private device info block */
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv)
+        if (!priv) {
+                ret = -ENOMEM;
                 goto out_put;
+        }
 
         priv->magic = IRTTY_MAGIC;
         priv->tty = tty;
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 1a00b5990cb8..f07c340990da 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -920,8 +920,10 @@ static int mcs_probe(struct usb_interface *intf,
 
         ndev->netdev_ops = &mcs_netdev_ops;
 
-        if (!intf->cur_altsetting)
+        if (!intf->cur_altsetting) {
+                ret = -ENOMEM;
                 goto error2;
+        }
 
         ret = mcs_find_endpoints(mcs, intf->cur_altsetting->endpoint,
                                  intf->cur_altsetting->desc.bNumEndpoints);
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);
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index e25067552b20..42fde9ed23e1 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -940,8 +940,10 @@ static int sa1100_irda_probe(struct platform_device *pdev)
                 goto err_mem_3;
 
         dev = alloc_irdadev(sizeof(struct sa1100_irda));
-        if (!dev)
+        if (!dev) {
+                err = -ENOMEM;
                 goto err_mem_4;
+        }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index eb315b8d07a3..4b746d9bd8e7 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -808,8 +808,8 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
                 goto err_mem_4;
 
         platform_set_drvdata(pdev, ndev);
-
-        if (request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self)) {
+        err = request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self);
+        if (err) {
                 dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n");
                 goto err_mem_4;
         }
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 795109425568..624ac1939e85 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -741,6 +741,7 @@ static int __devinit sh_sir_probe(struct platform_device *pdev)
         self->clk = clk_get(&pdev->dev, clk_name);
         if (IS_ERR(self->clk)) {
                 dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+                err = -ENODEV;
                 goto err_mem_3;
         }
 
@@ -760,8 +761,8 @@ static int __devinit sh_sir_probe(struct platform_device *pdev)
                 goto err_mem_4;
 
         platform_set_drvdata(pdev, ndev);
-
-        if (request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self)) {
+        err = request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self);
+        if (err) {
                 dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n");
                 goto err_mem_4;
         }