---

yaml --- r: 167543 b: refs/heads/master c: 91cd175 h: refs/heads/master i: 167541: a777b6d 167539: 256c92d 167535: 67760e4 v: v3
git-mirror · Oct 13, 2009 · 4b2ebf7 · 4b2ebf7
1 parent 994b1a7
commit 4b2ebf7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85584672012ee0c3b7b8e033a1ecf7c11878e45f
+refs/heads/master: 91cd1756cbbe9ba8772e6a5908f20cee56019c0d
diff --git a/trunk/drivers/net/irda/sa1100_ir.c b/trunk/drivers/net/irda/sa1100_ir.c
@@ -232,8 +232,11 @@ static int sa1100_irda_startup(struct sa1100_irda *si)
 	/*
 	 * Ensure that the ports for this device are setup correctly.
 	 */
-	if (si->pdata->startup)
-		si->pdata->startup(si->dev);
+	if (si->pdata->startup)	{
+		ret = si->pdata->startup(si->dev);
+		if (ret)
+			return ret;
+	}
 
 	/*
 	 * Configure PPC for IRDA - we want to drive TXD2 low.