[src-draft/trunk]: src/sys/dev/usb Backed out changeset e8d4991f10bb (may be ...

[Martin Husemann <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/7875c4a473a9
branches:  trunk
changeset: 986657:7875c4a473a9
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Mon Sep 20 17:01:29 2021 +0200

description:
Backed out changeset e8d4991f10bb (may be redone differently later)

diffstat:

 sys/dev/usb/if_urtwn.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r 01225a8269ba -r 7875c4a473a9 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Mon Sep 20 17:00:22 2021 +0200
+++ b/sys/dev/usb/if_urtwn.c    Mon Sep 20 17:01:29 2021 +0200
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.99 2021/09/17 13:00:20 nat Exp $        */
+/*     $NetBSD: if_urtwn.c,v 1.98 2021/09/17 12:58:31 nat Exp $        */
 /*     $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $       */
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.99 2021/09/17 13:00:20 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.98 2021/09/17 12:58:31 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -3362,10 +3362,7 @@
        KASSERT(mutex_owned(&sc->sc_write_mtx));
 
        /* Tell 8051 to reset itself. */
-       mutex_enter(&sc->sc_fwcmd_mtx);
        urtwn_write_1(sc, R92C_HMETFR + 3, 0x20);
-       sc->fwcur = 0;
-       mutex_exit(&sc->sc_fwcmd_mtx);
 
        /* Wait until 8051 resets by itself. */
        for (ntries = 0; ntries < 100; ntries++) {
@@ -3407,11 +3404,6 @@
        }
        DELAY(50);
 
-       mutex_enter(&sc->sc_fwcmd_mtx);
-       /* Init firmware commands ring. */
-       sc->fwcur = 0;
-       mutex_exit(&sc->sc_fwcmd_mtx);
-
 }
 
 static int