[src/jdolecek-ncq]: src/sys/dev/isa deallocate the channel structures properl...

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

details:   https://anonhg.NetBSD.org/src/rev/6c23b4b6deb6
branches:  jdolecek-ncq
changeset: 352774:6c23b4b6deb6
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Sep 20 19:59:22 2017 +0000

description:
deallocate the channel structures properly in wdc_isa_probe() also when
already the initial bus_space_map() fails

diffstat:

 sys/dev/isa/wdc_isa.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r aee56a1d3fae -r 6c23b4b6deb6 sys/dev/isa/wdc_isa.c
--- a/sys/dev/isa/wdc_isa.c     Wed Sep 20 19:45:37 2017 +0000
+++ b/sys/dev/isa/wdc_isa.c     Wed Sep 20 19:59:22 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_isa.c,v 1.59.28.2 2017/09/20 19:44:38 jdolecek Exp $ */
+/*     $NetBSD: wdc_isa.c,v 1.59.28.3 2017/09/20 19:59:22 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.59.28.2 2017/09/20 19:44:38 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.59.28.3 2017/09/20 19:59:22 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -143,9 +143,9 @@
        bus_space_unmap(wdr.ctl_iot, wdr.ctl_ioh, WDC_ISA_AUXREG_NPORTS);
 outunmap:
        bus_space_unmap(wdr.cmd_iot, wdr.cmd_baseioh, WDC_ISA_REG_NPORTS);
+out:
        ata_queue_free(ch.ch_queue);
        ata_channel_destroy(&ch);
-out:
        return (result);
 }