Module Name: src
Committed By: macallan
Date: Sat Feb 12 15:55:04 UTC 2022
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
initialize ntag with the old dmatag so we never end up with an invalid one
suggested by jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.301 src/sys/dev/usb/ehci.c:1.302
--- src/sys/dev/usb/ehci.c:1.301 Wed Jan 26 16:49:06 2022
+++ src/sys/dev/usb/ehci.c Sat Feb 12 15:55:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.301 2022/01/26 16:49:06 macallan Exp $ */
+/* $NetBSD: ehci.c,v 1.302 2022/02/12 15:55:04 macallan Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.301 2022/01/26 16:49:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.302 2022/02/12 15:55:04 macallan Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -498,7 +498,7 @@ ehci_init(ehci_softc_t *sc)
* - the driver doesn't currently set EHCI_CTRLDSSEGMENT to anything
* other than 0.
*/
- bus_dma_tag_t ntag = NULL;
+ bus_dma_tag_t ntag = sc->sc_bus.ub_dmatag;
sc->sc_dmatag = sc->sc_bus.ub_dmatag;
err = bus_dmatag_subregion(sc->sc_bus.ub_dmatag, 0, UINT32_MAX,
&ntag, 0);