Merge branch 'linus'

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 0e8e3fcde9ff..771e25d8c417 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -193,8 +193,12 @@ static int gfar_probe(struct platform_device *pdev)
                 priv->interruptTransmit = platform_get_irq_byname(pdev, "tx");
                 priv->interruptReceive = platform_get_irq_byname(pdev, "rx");
                 priv->interruptError = platform_get_irq_byname(pdev, "error");
+                if (priv->interruptTransmit < 0 || priv->interruptReceive < 0 || priv->interruptError < 0)
+                        goto regs_fail;
         } else {
                 priv->interruptTransmit = platform_get_irq(pdev, 0);
+                if (priv->interruptTransmit < 0)
+                        goto regs_fail;
         }
 
         /* get a pointer to the register memory */