Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 528767dec9d7..e5698fa30a4f 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -612,16 +612,16 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                 pr_debug("fifo status 0x%lx count %lu\n", status, count);
 
                 /* is fifo receiving already, or empty */
-                if (!(status & FIFOCTL_DIR)
-                    || (status & FIFOCTL_EMPTY))
+                if (!(status & FIFOCTL_DIR) ||
+                    (status & FIFOCTL_EMPTY))
                         return 0;
 
                 if (signal_pending(current))
                         return -EINTR;
 
                 /* shutting down? */
-                if (!netif_running(stir->netdev)
-                    || !netif_device_present(stir->netdev))
+                if (!netif_running(stir->netdev) ||
+                    !netif_device_present(stir->netdev))
                         return -ESHUTDOWN;
 
                 /* only waiting for some space */
@@ -776,8 +776,8 @@ static int stir_transmit_thread(void *arg)
                 }
 
                 /* nothing to send? start receiving */
-                if (!stir->receiving 
-                    && irda_device_txqueue_empty(dev)) {
+                if (!stir->receiving &&
+                    irda_device_txqueue_empty(dev)) {
                         /* Wait otherwise chip gets confused. */
                         if (fifo_txwait(stir, -1))
                                 break;