Module Name:    src
Committed By:   mrg
Date:           Sun Sep 27 03:48:07 UTC 2009

Modified Files:
        src/sys/external/bsd/drm/dist/bsd-core: drm_irq.c

Log Message:
make sure to call pci_intr_*stablish() with the right first argument;
it worked by C-luck on x86, but macppc picked it up.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.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/external/bsd/drm/dist/bsd-core/drm_irq.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.10 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.11
--- src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.10	Sat Jun 20 01:07:09 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c	Sun Sep 27 03:48:07 2009
@@ -225,7 +225,7 @@
 		goto err;
 	}
 	istr = pci_intr_string(dev->pa.pa_pc, ih);
-	dev->irqh = pci_intr_establish(&dev->pa.pa_pc, ih, IPL_TTY,
+	dev->irqh = pci_intr_establish(dev->pa.pa_pc, ih, IPL_TTY,
 	    drm_irq_handler_wrap, dev);
 	if (!dev->irqh) {
 		retcode = ENOENT;
@@ -264,7 +264,7 @@
 	bus_teardown_intr(dev->device, dev->irqr, dev->irqh);
 	DRM_LOCK();
 #elif   defined(__NetBSD__)
-	pci_intr_disestablish(&dev->pa.pa_pc, dev->irqh);
+	pci_intr_disestablish(dev->pa.pa_pc, dev->irqh);
 #endif
 
 	return 0;

Reply via email to