Module Name: src
Committed By: christos
Date: Thu Jul 24 17:35:10 UTC 2014
Modified Files:
src/sys/dev/ic: athn.c
Log Message:
sync with OpenBSD
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/athn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/athn.c
diff -u src/sys/dev/ic/athn.c:1.8 src/sys/dev/ic/athn.c:1.9
--- src/sys/dev/ic/athn.c:1.8 Sun Feb 23 10:29:12 2014
+++ src/sys/dev/ic/athn.c Thu Jul 24 13:35:10 2014
@@ -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 <[email protected]>
@@ -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 @@ athn_calib_to(void *arg)
/* 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);
