diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-09-05 17:17:58 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-09-12 10:41:56 +0200 |
| commit | 16dab54b8cbac39bd3f639db5d7d0fd8300a6cb0 (patch) | |
| tree | a7e9f4561bb4df38222c2ef5a48d111f52cc5dd3 /sound/ppc | |
| parent | ecbcfe36fa882e9f8f2be63ac0c42978336bf997 (diff) | |
| download | linux-3.10-16dab54b8cbac39bd3f639db5d7d0fd8300a6cb0.tar.gz linux-3.10-16dab54b8cbac39bd3f639db5d7d0fd8300a6cb0.tar.bz2 linux-3.10-16dab54b8cbac39bd3f639db5d7d0fd8300a6cb0.zip | |
[ALSA] Add snd_card_set_generic_dev() call
ARM,SA11xx UDA1341 driver,Generic drivers,MPU401 UART,MIPS
MIPS AU1x00 driver,PPC,PPC PowerMac driver,SPARC,SPARC AMD7930 driver
SPARC cs4231 driver,SPARC DBRI driver
- Added snd_card_set_generic_dev() call.
- Added SND_GENERIC_DRIVER to Kconfig.
- Clean up the error path in probe if necessary.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/Kconfig | 1 | ||||
| -rw-r--r-- | sound/ppc/powermac.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig index 75213bf4d56..bda5bc4e614 100644 --- a/sound/ppc/Kconfig +++ b/sound/ppc/Kconfig @@ -13,6 +13,7 @@ config SND_POWERMAC tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" depends on SND && I2C && INPUT && PPC_PMAC select SND_PCM + select SND_GENERIC_DRIVER help Say Y here to include support for the integrated sound device. diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 231f6432ea6..a6d8cbf4064 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -131,6 +131,9 @@ static int __init snd_pmac_probe(void) if (enable_beep) snd_pmac_attach_beep(chip); + if ((err = snd_card_set_generic_dev(card)) < 0) + goto __error; + if ((err = snd_card_register(card)) < 0) goto __error; |