Module Name: src
Committed By: skrll
Date: Fri Jun 10 14:43:35 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Only call sc_vendor_init once. Spotted by t-hash.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.71 -r1.28.2.72 src/sys/dev/usb/xhci.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.71 src/sys/dev/usb/xhci.c:1.28.2.72
--- src/sys/dev/usb/xhci.c:1.28.2.71 Sun Jun 5 10:50:36 2016
+++ src/sys/dev/usb/xhci.c Fri Jun 10 14:43:35 2016
@@ -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 @@ xhci_init(struct xhci_softc *sc)
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);
