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 Remove unintended commit



details:   https://anonhg.NetBSD.org/src/rev/9e83047f2494
branches:  nick-nhusb
changeset: 334383:9e83047f2494
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Feb 06 08:58:07 2016 +0000

description:
Remove unintended commit

diffstat:

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

diffs (35 lines):

diff -r 6d82b9838845 -r 9e83047f2494 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Sat Feb 06 08:53:03 2016 +0000
+++ b/sys/dev/usb/xhci.c        Sat Feb 06 08:58:07 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.28.2.50 2016/02/06 08:50:52 skrll Exp $     */
+/*     $NetBSD: xhci.c,v 1.28.2.51 2016/02/06 08:58:07 skrll Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.50 2016/02/06 08:50:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.51 2016/02/06 08:58:07 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -1023,16 +1023,12 @@
        iman = xhci_rt_read_4(sc, XHCI_IMAN(0));
        DPRINTFN(16, "IMAN0 %08x", iman, 0, 0, 0);
 
-#if 0
-#ifdef __HAVE_PCI_MSI_MSIX
        /* XXX 4.17.5 IP may be 0 if MSI/MSI-X is used */
        if (!(sc->sc_quirks & XHCI_QUIRK_FORCE_INTR)) {
                if ((iman & XHCI_IMAN_INTR_PEND) == 0) {
                        return 0;
                }
        }
-#endif
-#endif
 
        xhci_rt_write_4(sc, XHCI_IMAN(0), iman);
        iman = xhci_rt_read_4(sc, XHCI_IMAN(0));



Home | Main Index | Thread Index | Old Index