Source-Changes-HG archive

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

[src/nick-nhusb]: src/sys/dev/usb Only call sc_vendor_init once. Spotted by t...



details:   https://anonhg.NetBSD.org/src/rev/92290decadb6
branches:  nick-nhusb
changeset: 334520:92290decadb6
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jun 10 14:43:35 2016 +0000

description:
Only call sc_vendor_init once. Spotted by t-hash.

diffstat:

 sys/dev/usb/xhci.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 5140f0373991 -r 92290decadb6 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Fri Jun 10 08:15:21 2016 +0000
+++ b/sys/dev/usb/xhci.c        Fri Jun 10 14:43:35 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.28.2.71 2016/06/05 10:50:36 skrll Exp $     */
+/*     $NetBSD: xhci.c,v 1.28.2.72 2016/06/10 14:43:35 skrll Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.71 2016/06/05 10:50:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.72 2016/06/10 14:43:35 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -882,9 +882,6 @@
        if (sc->sc_vendor_init)
                sc->sc_vendor_init(sc);
 
-       if (sc->sc_vendor_init)
-               sc->sc_vendor_init(sc);
-
        pagesize = xhci_op_read_4(sc, XHCI_PAGESIZE);
        aprint_debug_dev(sc->sc_dev, "PAGESIZE 0x%08x\n", pagesize);
        pagesize = ffs(pagesize);



Home | Main Index | Thread Index | Old Index