[src/trunk]: src/sys/dev/ata If we're not going to handle a reset request bec...

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

details:   https://anonhg.NetBSD.org/src/rev/057958718406
branches:  trunk
changeset: 569881:057958718406
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Sep 11 18:01:58 2004 +0000

description:
If we're not going to handle a reset request because one if already pending,
decrease queue_freeze that we just increased (otherwise the queue stay
frozen after the reset).
Should fix kern/26873 and port-i386/26910.

diffstat:

 sys/dev/ata/ata.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r b1c087526628 -r 057958718406 sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Sat Sep 11 11:07:44 2004 +0000
+++ b/sys/dev/ata/ata.c Sat Sep 11 18:01:58 2004 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ata.c,v 1.59 2004/08/21 00:48:32 thorpej Exp $      */
+/*      $NetBSD: ata.c,v 1.60 2004/09/11 18:01:58 bouyer Exp $      */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.59 2004/08/21 00:48:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.60 2004/09/11 18:01:58 bouyer Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -864,6 +864,7 @@
        if ((flags & (AT_POLL | AT_WAIT)) == 0) {
                if (chp->ch_flags & ATACH_TH_RESET) {
                        /* No need to schedule a reset more than one time. */
+                       chp->ch_queue->queue_freeze--;
                        return;
                }
                chp->ch_flags |= ATACH_TH_RESET;