Merge remote-tracking branch 'net-next/master'

[linux] / drivers / net / wan / dscc4.c

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 27decf8..fa78d2b 100644 (file)
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -456,16 +456,16 @@ static int state_check(u32 state, struct dscc4_dev_priv *dpriv,
        int ret = 0;
 
        if (debug > 1) {
-       if (SOURCE_ID(state) != dpriv->dev_id) {
-               printk(KERN_DEBUG "%s (%s): Source Id=%d, state=%08x\n",
-                      dev->name, msg, SOURCE_ID(state), state );
+               if (SOURCE_ID(state) != dpriv->dev_id) {
+                       printk(KERN_DEBUG "%s (%s): Source Id=%d, state=%08x\n",
+                              dev->name, msg, SOURCE_ID(state), state);
                        ret = -1;
-       }
-       if (state & 0x0df80c00) {
-               printk(KERN_DEBUG "%s (%s): state=%08x (UFO alert)\n",
-                      dev->name, msg, state);
+               }
+               if (state & 0x0df80c00) {
+                       printk(KERN_DEBUG "%s (%s): state=%08x (UFO alert)\n",
+                              dev->name, msg, state);
                        ret = -1;
-       }
+               }
        }
        return ret;
 }
@@ -1760,25 +1760,25 @@ try:
        } else { /* SccEvt */
                if (debug > 1) {
                        //FIXME: verifier la presence de tous les evenements
-               static struct {
-                       u32 mask;
-                       const char *irq_name;
-               } evts[] = {
-                       { 0x00008000, "TIN"},
-                       { 0x00000020, "RSC"},
-                       { 0x00000010, "PCE"},
-                       { 0x00000008, "PLLA"},
-                       { 0, NULL}
-               }, *evt;
-
-               for (evt = evts; evt->irq_name; evt++) {
-                       if (state & evt->mask) {
+                       static struct {
+                               u32 mask;
+                               const char *irq_name;
+                       } evts[] = {
+                               { 0x00008000, "TIN"},
+                               { 0x00000020, "RSC"},
+                               { 0x00000010, "PCE"},
+                               { 0x00000008, "PLLA"},
+                               { 0, NULL}
+                       }, *evt;
+
+                       for (evt = evts; evt->irq_name; evt++) {
+                               if (state & evt->mask) {
                                        printk(KERN_DEBUG "%s: %s\n",
-                                               dev->name, evt->irq_name);
-                               if (!(state &= ~evt->mask))
-                                       goto try;
+                                              dev->name, evt->irq_name);
+                                       if (!(state &= ~evt->mask))
+                                               goto try;
+                               }
                        }
-               }
                } else {
                        if (!(state &= ~0x0000c03c))
                                goto try;