[src/trunk]: src/sys/dev/ic sync with OpenBSD

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dfbe60acc3b9
branches:  trunk
changeset: 330861:dfbe60acc3b9
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jul 24 17:35:10 2014 +0000

description:
sync with OpenBSD

diffstat:

 sys/dev/ic/athn.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 0dcb823ec6e0 -r dfbe60acc3b9 sys/dev/ic/athn.c
--- a/sys/dev/ic/athn.c Thu Jul 24 16:02:19 2014 +0000
+++ b/sys/dev/ic/athn.c Thu Jul 24 17:35:10 2014 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: athn.c,v 1.8 2014/02/23 15:29:12 christos Exp $        */
-/*     $OpenBSD: athn.c,v 1.75 2013/01/14 09:50:31 jsing Exp $ */
+/*     $NetBSD: athn.c,v 1.9 2014/07/24 17:35:10 christos Exp $        */
+/*     $OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $   */
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini%free.fr@localhost>
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.8 2014/02/23 15:29:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.9 2014/07/24 17:35:10 christos Exp $");
 
 #ifndef _MODULE
 #include "athn_usb.h"          /* for NATHN_USB */
@@ -1260,7 +1260,7 @@
        /* Do periodic (every 4 minutes) PA calibration. */
        if (AR_SREV_9285_11_OR_LATER(sc) &&
            !AR_SREV_9380_10_OR_LATER(sc) &&
-           ticks >= sc->sc_pa_calib_ticks + 240 * hz) {
+           (ticks - (sc->pa_calib_ticks + 240 * hz)) >= 0) {
                sc->sc_pa_calib_ticks = ticks;
                if (AR_SREV_9271(sc))
                        ar9271_pa_calib(sc);