[PATCH] powerpc: fix oops in alsa powermac driver
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Apr 2006 05:04:22 +0000 (15:04 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 21 Apr 2006 12:34:26 +0000 (22:34 +1000)
This fixes an oops in 2.6.16.X when loading the snd_powermac module. The
name of the requested module changed during the 2.6.16 development cycle
from i2c-keylargo to i2c-powermac.

Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/macintosh/therm_adt746x.c
sound/oss/dmasound/tas_common.c
sound/ppc/daca.c
sound/ppc/tumbler.c

index 5ebfd1d138dafc027d3c1c0ed37f926e010f0834..5282fec17075be859759a29c0eeb8662603f016e 100644 (file)
@@ -627,8 +627,8 @@ thermostat_init(void)
        if(therm_type == ADT7460)
                device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed);
 
-#ifndef CONFIG_I2C_KEYWEST
-       request_module("i2c-keywest");
+#ifndef CONFIG_I2C_POWERMAC
+       request_module("i2c-powermac");
 #endif
 
        return i2c_add_driver(&thermostat_driver);
index 81315996c0f1bf142c840a8bf2c7e87d39c1ba44..882ae98a41b127c7b23d76d4465bc1cc3e5f2acf 100644 (file)
@@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driver_name)
 
        printk(KERN_INFO "tas driver [%s])\n", driver_name);
 
-#ifndef CONFIG_I2C_KEYWEST
-       request_module("i2c-keywest");
+#ifndef CONFIG_I2C_POWERMAC
+       request_module("i2c-powermac");
 #endif
        tas_node = find_devices("deq");
        if (tas_node == NULL)
index aa09ebd9ffb8cfe9aed528a5e8f8d315bd9097a7..46eebf5610e39386cd3fc72eb40ccba456380d80 100644 (file)
@@ -255,7 +255,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
 
 #ifdef CONFIG_KMOD
        if (current->fs->root)
-               request_module("i2c-keywest");
+               request_module("i2c-powermac");
 #endif /* CONFIG_KMOD */       
 
        mix = kmalloc(sizeof(*mix), GFP_KERNEL);
index 1146dd882bb1079b684e9e381bb87a239992f21e..70e4ebc70260deea11b06670272e863b29da7340 100644 (file)
@@ -1313,7 +1313,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
 
 #ifdef CONFIG_KMOD
        if (current->fs->root)
-               request_module("i2c-keywest");
+               request_module("i2c-powermac");
 #endif /* CONFIG_KMOD */       
 
        mix = kmalloc(sizeof(*mix), GFP_KERNEL);