Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d6c5889 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[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: default avatarGuido Guenther <agx@sigxcpu.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5ad1bfea

drivers/macintosh/therm_adt746x.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/oss/dmasound/tas_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

sound/ppc/daca.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/ppc/tumbler.c

+1 −1
Original line number Diff line number Diff line
@@ -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);