The following commit has been merged in the linux branch: commit 91cd1756cbbe9ba8772e6a5908f20cee56019c0d Author: Dmitry Artamonow mad_soft@inbox.ru Date: Tue Oct 13 03:17:37 2009 -0700
irda/sa1100_ir: check return value of startup hook
Signed-off-by: Dmitry Artamonow mad_soft@inbox.ru Signed-off-by: David S. Miller davem@davemloft.net
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 38bf7cf..c412e80 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/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.