Source-Changes-HG archive

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

[src/netbsd-9]: src/sys/dev/usb Pull up following revision(s) (requested by i...



details:   https://anonhg.NetBSD.org/src/rev/f37689c71fa4
branches:  netbsd-9
changeset: 843532:f37689c71fa4
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 19 12:56:48 2019 +0000

description:
Pull up following revision(s) (requested by isaki in ticket #447):

        sys/dev/usb/uaudio.c: revision 1.162

Use kmem_zalloc() instead of kmem_alloc() to initialize structure.
struct audio_format added a member since isaki-audio2.

Fix PR kern/54662 "uaudio sometimes not recognized".

diffstat:

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

diffs (33 lines):

diff -r 5487b3c584a4 -r f37689c71fa4 sys/dev/usb/uaudio.c
--- a/sys/dev/usb/uaudio.c      Tue Nov 19 11:01:27 2019 +0000
+++ b/sys/dev/usb/uaudio.c      Tue Nov 19 12:56:48 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uaudio.c,v 1.161 2019/06/06 12:59:33 isaki Exp $       */
+/*     $NetBSD: uaudio.c,v 1.161.2.1 2019/11/19 12:56:48 martin Exp $  */
 
 /*
  * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.161 2019/06/06 12:59:33 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.161.2.1 2019/11/19 12:56:48 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1795,13 +1795,12 @@
        }
 
        /* build audio_format array */
-       sc->sc_formats = kmem_alloc(sizeof(struct audio_format) * sc->sc_nalts,
+       sc->sc_formats = kmem_zalloc(sizeof(struct audio_format) * sc->sc_nalts,
            KM_SLEEP);
        sc->sc_nformats = sc->sc_nalts;
        for (i = 0; i < sc->sc_nalts; i++) {
                auf = &sc->sc_formats[i];
                t1desc = sc->sc_alts[i].asf1desc;
-               auf->driver_data = NULL;
                if (UE_GET_DIR(sc->sc_alts[i].edesc->bEndpointAddress) == UE_DIR_OUT)
                        auf->mode = AUMODE_PLAY;
                else



Home | Main Index | Thread Index | Old Index