| From stable-bounces@linux.kernel.org Thu Apr 20 12:01:55 2006 |
| Date: Thu, 20 Apr 2006 20:59:10 +0200 |
| From: Guido Guenther <agx@sigxcpu.org> |
| To: Greg KH <greg@kroah.com> |
| Subject: Re: [stable] PPC: fix oops in alsa powermac driver |
| Message-ID: <20060420185909.GA18032@bogon.ms20.nix> |
| Content-Disposition: inline |
| Cc: benh@kernel.crashing.org, stable@kernel.org |
| |
| 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> |
| |
| --- |
| drivers/macintosh/therm_adt746x.c | 4 ++-- |
| sound/oss/dmasound/tas_common.c | 4 ++-- |
| sound/ppc/daca.c | 2 +- |
| sound/ppc/tumbler.c | 2 +- |
| 4 files changed, 6 insertions(+), 6 deletions(-) |
| |
| --- linux-2.6.16.9.orig/drivers/macintosh/therm_adt746x.c |
| +++ linux-2.6.16.9/drivers/macintosh/therm_adt746x.c |
| @@ -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); |
| --- linux-2.6.16.9.orig/sound/oss/dmasound/tas_common.c |
| +++ linux-2.6.16.9/sound/oss/dmasound/tas_common.c |
| @@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driv |
| |
| 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) |
| --- linux-2.6.16.9.orig/sound/ppc/daca.c |
| +++ linux-2.6.16.9/sound/ppc/daca.c |
| @@ -256,7 +256,7 @@ int __init snd_pmac_daca_init(struct snd |
| |
| #ifdef CONFIG_KMOD |
| if (current->fs->root) |
| - request_module("i2c-keywest"); |
| + request_module("i2c-powermac"); |
| #endif /* CONFIG_KMOD */ |
| |
| mix = kmalloc(sizeof(*mix), GFP_KERNEL); |
| --- linux-2.6.16.9.orig/sound/ppc/tumbler.c |
| +++ linux-2.6.16.9/sound/ppc/tumbler.c |
| @@ -1314,7 +1314,7 @@ int __init snd_pmac_tumbler_init(struct |
| |
| #ifdef CONFIG_KMOD |
| if (current->fs->root) |
| - request_module("i2c-keywest"); |
| + request_module("i2c-powermac"); |
| #endif /* CONFIG_KMOD */ |
| |
| mix = kmalloc(sizeof(*mix), GFP_KERNEL); |
