From 7e1d895536c19a408590cb1d976851c310141c41 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Fri, 5 Oct 2012 11:33:02 +0000 Subject: [PATCH] --- yaml --- r: 332901 b: refs/heads/master c: 812b074b5ba2937d2edc0e5b0019fa163ba86882 h: refs/heads/master i: 332899: e56fbd043593fd0ff60d417b70d42bdfe79dee39 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/sh_irda.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 10b191fbcaab..7ea4297d1208 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd9d11607ebe106acab6cf3ad578e72c956823a1 +refs/heads/master: 812b074b5ba2937d2edc0e5b0019fa163ba86882 diff --git a/trunk/drivers/net/irda/sh_irda.c b/trunk/drivers/net/irda/sh_irda.c index eb315b8d07a3..4b746d9bd8e7 100644 --- a/trunk/drivers/net/irda/sh_irda.c +++ b/trunk/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; }