rpms/kernel/F-8 linux-2.6-isdn-hisax-fix-request_irq-oops.patch, NONE, 1.1 kernel.spec, 1.361, 1.362

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17135

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-isdn-hisax-fix-request_irq-oops.patch 
Log Message:
* Mon Mar 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-16
- ISDN: don't oops on driver load (#362621)


linux-2.6-isdn-hisax-fix-request_irq-oops.patch:

--- NEW FILE linux-2.6-isdn-hisax-fix-request_irq-oops.patch ---
After a quick glance at the code, we're getting the DEBUG_SHIRQ spurious
interrupt before we have the adapter template filled in. Real interrupts
appear to be turned on by fcpci*_init(), so move request_irq until just
before that.

Signed-off-by: Kyle McMartin <kmcmartin at redhat.com>

---
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 7993e01..76043de 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -725,23 +725,6 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
 
 	switch (adapter->type) {
 	case AVM_FRITZ_PCIV2:
-		retval = request_irq(adapter->irq, fcpci2_irq, IRQF_SHARED,
-				     "fcpcipnp", adapter);
-		break;
-	case AVM_FRITZ_PCI:
-		retval = request_irq(adapter->irq, fcpci_irq, IRQF_SHARED,
-				     "fcpcipnp", adapter);
-		break;
-	case AVM_FRITZ_PNP:
-		retval = request_irq(adapter->irq, fcpci_irq, 0,
-				     "fcpcipnp", adapter);
-		break;
-	}
-	if (retval)
-		goto err_region;
-
-	switch (adapter->type) {
-	case AVM_FRITZ_PCIV2:
 	case AVM_FRITZ_PCI:
 		val = inl(adapter->io);
 		break;
@@ -796,6 +779,23 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
 
 	switch (adapter->type) {
 	case AVM_FRITZ_PCIV2:
+		retval = request_irq(adapter->irq, fcpci2_irq, IRQF_SHARED,
+				     "fcpcipnp", adapter);
+		break;
+	case AVM_FRITZ_PCI:
+		retval = request_irq(adapter->irq, fcpci_irq, IRQF_SHARED,
+				     "fcpcipnp", adapter);
+		break;
+	case AVM_FRITZ_PNP:
+		retval = request_irq(adapter->irq, fcpci_irq, 0,
+				     "fcpcipnp", adapter);
+		break;
+	}
+	if (retval)
+		goto err_region;
+
+	switch (adapter->type) {
+	case AVM_FRITZ_PCIV2:
 		fcpci2_init(adapter);
 		isacsx_setup(&adapter->isac);
 		break;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- kernel.spec	3 Mar 2008 22:36:06 -0000	1.361
+++ kernel.spec	3 Mar 2008 23:29:42 -0000	1.362
@@ -679,6 +679,7 @@
 Patch1103: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
 
 Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch
+Patch1320: linux-2.6-isdn-hisax-fix-request_irq-oops.patch
 
 Patch1400: linux-2.6-smarter-relatime.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
@@ -1280,6 +1281,10 @@
 # some usb disks spin down automatically and need allow_restart
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 
+# ISDN
+# fix request_irq oops
+ApplyPatch linux-2.6-isdn-hisax-fix-request_irq-oops.patch
+
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
 
@@ -1913,6 +1918,9 @@
 
 
 %changelog
+* Mon Mar 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-16
+- ISDN: don't oops on driver load (#362621)
+
 * Mon Mar 03 2008 John W. Linville <linville at redhat.com> 2.6.24.3-15
 - ssb: Add CHIPCO IRQ access functions
 - p54: print unknown eeprom fields