irda/sa1100_ir: check return value of startup hook
authorDmitry Artamonow <mad_soft@inbox.ru>
Tue, 13 Oct 2009 10:17:37 +0000 (03:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 10:17:37 +0000 (03:17 -0700)
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/irda/sa1100_ir.c

index 38bf7cf2256d04f7c15dd655be706e3c3b779c94..c412e80261737b6cc34b3ce986879f139cd0dd54 100644 (file)
@@ -232,8 +232,11 @@ static int sa1100_irda_startup(struct sa1100_irda *si)
        /*
         * Ensure that the ports for this device are setup correctly.
         */
        /*
         * 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.
 
        /*
         * Configure PPC for IRDA - we want to drive TXD2 low.