tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] powerpc: fix oops in alsa powermac driver

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>

authored by Benjamin Herrenschmidt and committed by Paul Mackerras 4d6c5889 5ad1bfea

+6 -6
unified split
+2 -2
drivers/macintosh/therm_adt746x.c
··· 627 627 if(therm_type == ADT7460) 628 628 device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed); 629 629 630 - #ifndef CONFIG_I2C_KEYWEST 631 - request_module("i2c-keywest"); 630 + #ifndef CONFIG_I2C_POWERMAC 631 + request_module("i2c-powermac"); 632 632 #endif 633 633 634 634 return i2c_add_driver(&thermostat_driver);
+2 -2
sound/oss/dmasound/tas_common.c
··· 195 195 196 196 printk(KERN_INFO "tas driver [%s])\n", driver_name); 197 197 198 - #ifndef CONFIG_I2C_KEYWEST 199 - request_module("i2c-keywest"); 198 + #ifndef CONFIG_I2C_POWERMAC 199 + request_module("i2c-powermac"); 200 200 #endif 201 201 tas_node = find_devices("deq"); 202 202 if (tas_node == NULL)
+1 -1
sound/ppc/daca.c
··· 255 255 256 256 #ifdef CONFIG_KMOD 257 257 if (current->fs->root) 258 - request_module("i2c-keywest"); 258 + request_module("i2c-powermac"); 259 259 #endif /* CONFIG_KMOD */ 260 260 261 261 mix = kmalloc(sizeof(*mix), GFP_KERNEL);
+1 -1
sound/ppc/tumbler.c
··· 1313 1313 1314 1314 #ifdef CONFIG_KMOD 1315 1315 if (current->fs->root) 1316 - request_module("i2c-keywest"); 1316 + request_module("i2c-powermac"); 1317 1317 #endif /* CONFIG_KMOD */ 1318 1318 1319 1319 mix = kmalloc(sizeof(*mix), GFP_KERNEL);