CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Mon Jan 28 08:22:02 UTC 2013

Modified Files:
        src/sys/dev/usb: dwc_otg.c

Log Message:
Getting HCINT_SOFTWARE_ONLY from the hardware is an error. KASSERT that
it doesn't happen.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.39 src/sys/dev/usb/dwc_otg.c:1.40
--- src/sys/dev/usb/dwc_otg.c:1.39	Mon Jan 28 08:19:33 2013
+++ src/sys/dev/usb/dwc_otg.c	Mon Jan 28 08:22:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc_otg.c,v 1.39 2013/01/28 08:19:33 skrll Exp $	*/
+/*	$NetBSD: dwc_otg.c,v 1.40 2013/01/28 08:22:01 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.39 2013/01/28 08:19:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.40 2013/01/28 08:22:01 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3255,7 +3255,8 @@ repeat:
 // 			DPRINTF("ch %d intrs %08x\n", ch, intrs);
 
 			DWC_OTG_WRITE_4(sc, DOTG_HCINT(ch), intrs);
-			intrs &= ~HCINT_SOFTWARE_ONLY;
+
+			KASSERT((intrs & HCINT_SOFTWARE_ONLY) == 0);
 			sc->sc_chan_state[ch].hcint |= intrs;
 		}
 	}