patch-2.4.19 linux-2.4.19/drivers/isdn/hisax/hfc_pci.c

Next file: linux-2.4.19/drivers/isdn/hisax/hisax_fcpcipnp.c
Previous file: linux-2.4.19/drivers/isdn/hisax/fsm.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/drivers/isdn/hisax/hfc_pci.c linux-2.4.19/drivers/isdn/hisax/hfc_pci.c
@@ -76,6 +76,8 @@
 {
 	unsigned long flags;
 
+	printk(KERN_INFO "HiSax: release hfcpci at %p\n",
+		cs->hw.hfcpci.pci_io);
 	save_flags(flags);
 	cli();
 	cs->hw.hfcpci.int_m2 = 0;	/* interrupt output off ! */
@@ -86,13 +88,11 @@
 	set_current_state(TASK_UNINTERRUPTIBLE);
 	schedule_timeout((30 * HZ) / 1000);	/* Timeout 30ms */
 	Write_hfc(cs, HFCPCI_CIRM, 0);	/* Reset Off */
-#if CONFIG_PCI
 	pcibios_write_config_word(cs->hw.hfcpci.pci_bus, cs->hw.hfcpci.pci_device_fn, PCI_COMMAND, 0);	/* disable memory mapped ports + busmaster */
-#endif				/* CONFIG_PCI */
 	del_timer(&cs->hw.hfcpci.timer);
 	kfree(cs->hw.hfcpci.share_start);
 	cs->hw.hfcpci.share_start = NULL;
-	vfree(cs->hw.hfcpci.pci_io);
+	iounmap((void *)cs->hw.hfcpci.pci_io);
 }
 
 /********************************************************************************/

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)