Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb fix DIAGNOSTIC build by not copying ub_usepollin...



details:   https://anonhg.NetBSD.org/src/rev/d950969b2a40
branches:  trunk
changeset: 991958:d950969b2a40
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Thu Aug 09 18:17:39 2018 +0000

description:
fix DIAGNOSTIC build by not copying ub_usepolling to stack before use

diffstat:

 sys/dev/usb/ehci.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r 7331f41615dc -r d950969b2a40 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Thu Aug 09 17:43:54 2018 +0000
+++ b/sys/dev/usb/ehci.c        Thu Aug 09 18:17:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.260 2018/08/09 06:26:47 mrg Exp $ */
+/*     $NetBSD: ehci.c,v 1.261 2018/08/09 18:17:39 jakllsch Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.260 2018/08/09 06:26:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.261 2018/08/09 18:17:39 jakllsch Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -1037,9 +1037,8 @@
        ehci_soft_qtd_t *sqtd, *fsqtd, *lsqtd;
        uint32_t status = 0, nstatus = 0;
        int actlen = 0;
-       bool polling = sc->sc_bus.ub_usepolling;
-
-       KASSERT(polling || mutex_owned(&sc->sc_lock));
+
+       KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 
        DPRINTF("ex=%#jx", (uintptr_t)ex, 0, 0, 0);
 



Home | Main Index | Thread Index | Old Index