iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] powerpc: fix oops in alsa powermac driver

Browse Source 
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>
This commit is contained in:
Benjamin Herrenschmidt 2006-04-21 15:04:22 +10:00 committed by Paul Mackerras
parent 5ad1bfeaf7
commit 4d6c58899c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/macintosh/therm_adt746x.c
View File

@ -627,8 +627,8 @@ thermostat_init(void)
if(therm_type == ADT7460) if(therm_type == ADT7460)
device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed); device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed);
#ifndef CONFIG_I2C_KEYWEST #ifndef CONFIG_I2C_POWERMAC
request_module("i2c-keywest"); request_module("i2c-powermac");
#endif #endif
return i2c_add_driver(&thermostat_driver); return i2c_add_driver(&thermostat_driver);

4
sound/oss/dmasound/tas_common.c
View File

@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driver_name)
printk(KERN_INFO "tas driver [%s])\n", driver_name); printk(KERN_INFO "tas driver [%s])\n", driver_name);
#ifndef CONFIG_I2C_KEYWEST #ifndef CONFIG_I2C_POWERMAC
request_module("i2c-keywest"); request_module("i2c-powermac");
#endif #endif
tas_node = find_devices("deq"); tas_node = find_devices("deq");
if (tas_node == NULL) if (tas_node == NULL)

2
sound/ppc/daca.c
View File

@ -255,7 +255,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
#ifdef CONFIG_KMOD #ifdef CONFIG_KMOD
if (current->fs->root) if (current->fs->root)
request_module("i2c-keywest"); request_module("i2c-powermac");
#endif /* CONFIG_KMOD */ #endif /* CONFIG_KMOD */
mix = kmalloc(sizeof(*mix), GFP_KERNEL); mix = kmalloc(sizeof(*mix), GFP_KERNEL);

2
sound/ppc/tumbler.c
View File

@ -1313,7 +1313,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
#ifdef CONFIG_KMOD #ifdef CONFIG_KMOD
if (current->fs->root) if (current->fs->root)
request_module("i2c-keywest"); request_module("i2c-powermac");
#endif /* CONFIG_KMOD */ #endif /* CONFIG_KMOD */
mix = kmalloc(sizeof(*mix), GFP_KERNEL); mix = kmalloc(sizeof(*mix), GFP_KERNEL);