diff options
author | Dmitry Artamonow <mad_soft@inbox.ru> | 2009-10-13 06:17:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-13 06:17:37 -0400 |
commit | 91cd1756cbbe9ba8772e6a5908f20cee56019c0d (patch) | |
tree | 512462d629d4762d781b2a40094cdfd196ffc4e1 /drivers/net/irda/sa1100_ir.c | |
parent | 85584672012ee0c3b7b8e033a1ecf7c11878e45f (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/irda/sa1100_ir.c')
-rw-r--r-- | drivers/net/irda/sa1100_ir.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 38bf7cf2256d..c412e8026173 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) | |||
232 | /* | 232 | /* |
233 | * Ensure that the ports for this device are setup correctly. | 233 | * Ensure that the ports for this device are setup correctly. |
234 | */ | 234 | */ |
235 | if (si->pdata->startup) | 235 | if (si->pdata->startup) { |
236 | si->pdata->startup(si->dev); | 236 | ret = si->pdata->startup(si->dev); |
237 | if (ret) | ||
238 | return ret; | ||
239 | } | ||
237 | 240 | ||
238 | /* | 241 | /* |
239 | * Configure PPC for IRDA - we want to drive TXD2 low. | 242 | * Configure PPC for IRDA - we want to drive TXD2 low. |