Merge remote-tracking branches 'asoc/fix/mtk', 'asoc/fix/psc', 'asoc/fix/pxa', 'asoc...

[cascardo/linux.git] / drivers / staging / vt6656 / baseband.c

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index e6c7b60..26b1677 100644 (file)
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -167,20 +167,18 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,
                        frame_time++;
 
                return preamble + frame_time;
-       } else {
-               frame_time = (frame_length * 8 + 22) / rate;
-               tmp = ((frame_time * rate) - 22) / 8;
-
-               if (frame_length != tmp)
-                       frame_time++;
+       }
+       frame_time = (frame_length * 8 + 22) / rate;
+       tmp = ((frame_time * rate) - 22) / 8;
 
-               frame_time = frame_time * 4;
+       if (frame_length != tmp)
+               frame_time++;
 
-               if (pkt_type != PK_TYPE_11A)
-                       frame_time += 6;
+       frame_time = frame_time * 4;
 
-               return 20 + frame_time;
-       }
+       if (pkt_type != PK_TYPE_11A)
+               frame_time += 6;
+       return 20 + frame_time;
 }
 
 /*