diff options
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b3a9ce5d5183..702af98e8ae3 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2794,7 +2794,7 @@ static void __devinit check_msi(struct azx *chip) } #ifdef CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA -static const char *tegra_clk_names[] __initdata = { +static const char *tegra_clk_names[] __devinitdata = { "hda", "hda2codec", "hda2hdmi", @@ -2811,7 +2811,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, struct azx **rchip) { struct azx *chip; - int i, err; + int i, err = 0; unsigned short gcap; static struct snd_device_ops ops = { .dev_free = azx_dev_free, @@ -3360,7 +3360,7 @@ static const struct platform_device_id azx_platform_ids[] = { MODULE_DEVICE_TABLE(platform, azx_platform_ids); /* platform_driver definition */ -static struct platform_driver driver_platform = { +static struct platform_driver hda_platform_driver = { .driver = { .name = "hda-platform" }, @@ -3385,7 +3385,7 @@ static int __init alsa_card_azx_init(void) } #ifdef CONFIG_SND_HDA_PLATFORM_DRIVER - err = platform_driver_register(&driver_platform); + err = platform_driver_register(&hda_platform_driver); if (err < 0) { snd_printk(KERN_ERR SFX "Failed to register platform driver\n"); pci_unregister_driver(&driver); @@ -3399,7 +3399,7 @@ static int __init alsa_card_azx_init(void) static void __exit alsa_card_azx_exit(void) { #ifdef CONFIG_SND_HDA_PLATFORM_DRIVER - platform_driver_unregister(&driver_platform); + platform_driver_unregister(&hda_platform_driver); #endif pci_unregister_driver(&driver); |