Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

[sfrench/cifs-2.6.git] / arch / powerpc / math-emu / fmsub.c

diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c
index a644d525fca66442f0c2322b52fe0d9c6d1d4f5c..626f6fed84ac5c06541013dcd7df5c5c4a2f8104 100644 (file)
--- a/arch/powerpc/math-emu/fmsub.c
+++ b/arch/powerpc/math-emu/fmsub.c
@@ -15,7 +15,6 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
        FP_DECL_D(C);
        FP_DECL_D(T);
        FP_DECL_EX;
-       int ret = 0;
 
 #ifdef DEBUG
        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
@@ -33,7 +32,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
 
        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-               ret |= EFLAG_VXIMZ;
+               FP_SET_EXCEPTION(EFLAG_VXIMZ);
 
        FP_MUL_D(T, A, C);
 
@@ -41,7 +40,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
                B_s ^= 1;
 
        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-               ret |= EFLAG_VXISI;
+               FP_SET_EXCEPTION(EFLAG_VXISI);
 
        FP_ADD_D(R, T, B);