Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / isdn / hisax / hfc4s8s_l1.c

diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 0e5d673871c05b30bc906e7131ead462eb86c667..9600cd771f1a3a234a3b7c647904f3dbd22385c7 100644 (file)
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -646,14 +646,14 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
 
                f1 = Read_hfc8_stable(l1p->hw, A_F1);
                f2 = Read_hfc8(l1p->hw, A_F2);
-               df = f1 - f2;
-               if ((f1 - f2) < 0)
-                       df = f1 - f2 + MAX_F_CNT + 1;
 
+               if (f1 < f2)
+                       df = MAX_F_CNT + 1 + f1 - f2;
+               else
+                       df = f1 - f2;
 
-               if (!df) {
+               if (!df)
                        return; /* no complete frame in fifo */
-               }
 
                z1 = Read_hfc16_stable(l1p->hw, A_Z1);
                z2 = Read_hfc16(l1p->hw, A_Z2);