From bb033f626014081bc612d9e036f9a59854c715a3 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 10 Mar 2010 15:21:23 -0800 Subject: [PATCH] --- yaml --- r: 187163 b: refs/heads/master c: 0d3580d40cc38bbaf63d0b2756931e0ae241a9ea h: refs/heads/master i: 187161: c1901a292d258912c9781297b2b5b60372ff1260 187159: 8a9b5d4d88bb2fbbc8803023e40238e85125d139 v: v3 --- [refs] | 2 +- trunk/drivers/video/asiliantfb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 332661b5ab52..98b17f139dae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e3e37a5a7c91045497553bcbd6a5faea98b21b3 +refs/heads/master: 0d3580d40cc38bbaf63d0b2756931e0ae241a9ea diff --git a/trunk/drivers/video/asiliantfb.c b/trunk/drivers/video/asiliantfb.c index 9fe90ce928fb..e70bc225fe31 100644 --- a/trunk/drivers/video/asiliantfb.c +++ b/trunk/drivers/video/asiliantfb.c @@ -140,7 +140,7 @@ static void asiliant_calc_dclk2(u32 *ppixclock, u8 *dclk2_m, u8 *dclk2_n, u8 *dc /* 3 <= m <= 257 */ if (m >= 3 && m <= 257) { - unsigned new_error = ((Ftarget * n) - (Fref * m)) >= 0 ? + unsigned new_error = Ftarget * n >= Fref * m ? ((Ftarget * n) - (Fref * m)) : ((Fref * m) - (Ftarget * n)); if (new_error < best_error) { best_n = n; @@ -152,7 +152,7 @@ static void asiliant_calc_dclk2(u32 *ppixclock, u8 *dclk2_m, u8 *dclk2_n, u8 *dc else if (m <= 1028) { /* remember there are still only 8-bits of precision in m, so * avoid over-optimistic error calculations */ - unsigned new_error = ((Ftarget * n) - (Fref * (m & ~3))) >= 0 ? + unsigned new_error = Ftarget * n >= Fref * (m & ~3) ? ((Ftarget * n) - (Fref * (m & ~3))) : ((Fref * (m & ~3)) - (Ftarget * n)); if (new_error < best_error) { best_n = n;