Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ata ata_timeout: restore spl in ATACH_RECOVERING path



details:   https://anonhg.NetBSD.org/src/rev/3ac392ccc87b
branches:  trunk
changeset: 979204:3ac392ccc87b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Dec 19 18:09:44 2020 +0000

description:
ata_timeout: restore spl in ATACH_RECOVERING path

diffstat:

 sys/dev/ata/ata_subr.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 71da96329710 -r 3ac392ccc87b sys/dev/ata/ata_subr.c
--- a/sys/dev/ata/ata_subr.c    Sat Dec 19 17:54:29 2020 +0000
+++ b/sys/dev/ata/ata_subr.c    Sat Dec 19 18:09:44 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ata_subr.c,v 1.11 2020/05/02 19:09:56 thorpej Exp $    */
+/*     $NetBSD: ata_subr.c,v 1.12 2020/12/19 18:09:44 jmcneill Exp $   */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_subr.c,v 1.11 2020/05/02 19:09:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_subr.c,v 1.12 2020/12/19 18:09:44 jmcneill Exp $");
 
 #include "opt_ata.h"
 
@@ -237,7 +237,7 @@
 
        if (chp->ch_flags & ATACH_RECOVERING) {
                /* Do nothing, recovery will requeue the xfers */
-               return;
+               goto done;
        }
 
        /*
@@ -259,6 +259,7 @@
                xfer->ops->c_intr(xfer->c_chp, xfer, 0);
        }
 
+done:
        splx(s);
 }
 



Home | Main Index | Thread Index | Old Index