[src/jdolecek-ncq]: src/sys/dev/ata add missing ata_channel_unlock() in bailo...

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

details:   https://anonhg.NetBSD.org/src/rev/ef2edf882d5d
branches:  jdolecek-ncq
changeset: 823027:ef2edf882d5d
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Sep 21 18:47:21 2017 +0000

description:
add missing ata_channel_unlock() in bailout path of wdc_ata_bio_intr()

diffstat:

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

diffs (30 lines):

diff -r 27f4264ee92e -r ef2edf882d5d sys/dev/ata/ata_wdc.c
--- a/sys/dev/ata/ata_wdc.c     Thu Sep 21 17:15:18 2017 +0000
+++ b/sys/dev/ata/ata_wdc.c     Thu Sep 21 18:47:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ata_wdc.c,v 1.105.6.9 2017/09/10 19:31:15 jdolecek Exp $       */
+/*     $NetBSD: ata_wdc.c,v 1.105.6.10 2017/09/21 18:47:21 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.105.6.9 2017/09/10 19:31:15 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.105.6.10 2017/09/21 18:47:21 jdolecek Exp $");
 
 #include "opt_ata.h"
 #include "opt_wdc.h"
@@ -662,8 +662,10 @@
 
        /* Ack interrupt done by wdc_wait_for_unbusy */
        if (wdc_wait_for_unbusy(chp, poll ? ATA_DELAY : 0, AT_POLL, &tfd) < 0) {
-               if (!poll && (xfer->c_flags & C_TIMEOU) == 0)
+               if (!poll && (xfer->c_flags & C_TIMEOU) == 0) {
+                       ata_channel_unlock(chp);
                        return 0; /* IRQ was not for us */
+               }
                printf("%s:%d:%d: device timeout, c_bcount=%d, c_skip%d\n",
                    device_xname(atac->atac_dev), chp->ch_channel, xfer->c_drive,
                    xfer->c_bcount, xfer->c_skip);