aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-10-13 03:17:37 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-13 03:17:37 -0700
commit91cd1756cbbe9ba8772e6a5908f20cee56019c0d (patch)
tree512462d629d4762d781b2a40094cdfd196ffc4e1 /drivers/net
parent85584672012ee0c3b7b8e033a1ecf7c11878e45f (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/irda/sa1100_ir.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 38bf7cf2256..c412e802617 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.