Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/ehci_pci.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/ehci_pci.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.64
retrieving revision 1.64.8.1
diff -u -p -r1.64 -r1.64.8.1
--- src/sys/dev/pci/ehci_pci.c	2016/10/13 20:05:06	1.64
+++ src/sys/dev/pci/ehci_pci.c	2017/06/15 05:30:13	1.64.8.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci_pci.c,v 1.64 2016/10/13 20:05:06 jdolecek Exp $	*/
+/*	$NetBSD: ehci_pci.c,v 1.64.8.1 2017/06/15 05:30:13 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.64 2016/10/13 20:05:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.64.8.1 2017/06/15 05:30:13 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -161,10 +161,14 @@ ehci_pci_attach(device_t parent, device_
 		break;
 	}
 
+	pcireg_t intr = pci_conf_read(pc, tag, PCI_INTERRUPT_REG);
+	int pin = PCI_INTERRUPT_PIN(intr);
+
 	/* Enable the device. */
 	csr = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
-	pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG,
-		       csr | PCI_COMMAND_MASTER_ENABLE);
+	csr |= PCI_COMMAND_MASTER_ENABLE;
+	csr &= ~(pin ? PCI_COMMAND_INTERRUPT_DISABLE : 0);
+	pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG, csr);
 
 	/* Map and establish the interrupt. */
 	if (pci_intr_map(pa, &ih)) {