[src/trunk]: src/sys/dev/usb close pipe before freeing frame length array.

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

details:   https://anonhg.NetBSD.org/src/rev/03b0e818dc58
branches:  trunk
changeset: 983320:03b0e818dc58
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun May 16 09:17:23 2021 +0000

description:
close pipe before freeing frame length array.

diffstat:

 sys/dev/usb/uvideo.c |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r b15cb1744f72 -r 03b0e818dc58 sys/dev/usb/uvideo.c
--- a/sys/dev/usb/uvideo.c      Sun May 16 09:02:04 2021 +0000
+++ b/sys/dev/usb/uvideo.c      Sun May 16 09:17:23 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvideo.c,v 1.59 2020/08/10 19:27:27 rjs Exp $  */
+/*     $NetBSD: uvideo.c,v 1.60 2021/05/16 09:17:23 mlelstv Exp $      */
 
 /*
  * Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.59 2020/08/10 19:27:27 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.60 2021/05/16 09:17:23 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1659,7 +1659,15 @@
                                usbd_destroy_xfer(isoc->i_xfer);
                                isoc->i_xfer = NULL;
                        }
-
+               }
+
+               if (ix->ix_pipe != NULL) {
+                       usbd_close_pipe(ix->ix_pipe);
+                       ix->ix_pipe = NULL;
+               }
+
+               for (i = 0; i < UVIDEO_NXFERS; i++) {
+                       struct uvideo_isoc *isoc = &ix->ix_i[i];
                        if (isoc->i_frlengths != NULL) {
                                kmem_free(isoc->i_frlengths,
                                  sizeof(isoc->i_frlengths[0]) *
@@ -1668,10 +1676,6 @@
                        }
                }
 
-               if (ix->ix_pipe != NULL) {
-                       usbd_close_pipe(ix->ix_pipe);
-                       ix->ix_pipe = NULL;
-               }
                /* Give it some time to settle */
                usbd_delay_ms(vs->vs_parent->sc_udev, 1000);