X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sound%2Foss%2Fkahlua.c;h=12e7b3038be2bb8a05dcb2c27045d4023c340464;hb=refs%2Fheads%2Fvserver;hp=c09ea8827fea60f96dd24d9cceada915a14fddbc;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index c09ea8827..12e7b3038 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -27,7 +27,7 @@
  *	same manner.
  */
 
-#include <linux/config.h>
+#include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -55,7 +55,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
 {
 	struct address_info *hw_config;
 	unsigned long base;
-	void *mem;
+	void __iomem *mem;
 	unsigned long io;
 	u16 map;
 	u8 irq, dma8, dma16;
@@ -155,10 +155,14 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
 	hw_config->dma2 = dma16;
 	hw_config->name = "Cyrix XpressAudio";
 	hw_config->driver_use_1 = SB_NO_MIDI | SB_PCI_IRQ;
+
+	if (!request_region(io, 16, "soundblaster"))
+		goto err_out_free;
 	
 	if(sb_dsp_detect(hw_config, 0, 0, NULL)==0)
 	{
 		printk(KERN_ERR "kahlua: audio not responding.\n");
+		release_region(io, 16);
 		goto err_out_free;
 	}
 
@@ -213,12 +217,12 @@ static struct pci_driver kahlua_driver = {
 static int __init kahlua_init_module(void)
 {
 	printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");
-	return pci_module_init(&kahlua_driver);
+	return pci_register_driver(&kahlua_driver);
 }
 
 static void __devexit kahlua_cleanup_module(void)
 {
-	return pci_unregister_driver(&kahlua_driver);
+	pci_unregister_driver(&kahlua_driver);
 }