tree-wide: Assorted spelling fixes

[firefly-linux-kernel-4.4.55.git] / drivers / net / irda / sa1100_ir.c

diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 38bf7cf2256d04f7c15dd655be706e3c3b779c94..1dcdce0631aa9439815047628ed30547072f2dc3 100644 (file)
--- 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.
@@ -328,7 +331,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)
                 * If we missed a speed change, initialise at the new speed
                 * directly.  It is debatable whether this is actually
                 * required, but in the interests of continuing from where
-                * we left off it is desireable.  The converse argument is
+                * we left off it is desirable.  The converse argument is
                 * that we should re-negotiate at 9600 baud again.
                 */
                if (si->newspeed) {