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/mips | |
| parent | ecbcfe36fa882e9f8f2be63ac0c42978336bf997 (diff) | |
[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/mips')
| -rw-r--r-- | sound/mips/Kconfig | 1 | ||||
| -rw-r--r-- | sound/mips/au1x00.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig index 531f8ba96a7..2433b772740 100644 --- a/sound/mips/Kconfig +++ b/sound/mips/Kconfig @@ -8,6 +8,7 @@ config SND_AU1X00 depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND select SND_PCM select SND_AC97_CODEC + select SND_GENERIC_DRIVER help ALSA Sound driver for the Au1x00's AC97 port. diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index c20522b0213..3f9684f1d1d 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c @@ -667,6 +667,11 @@ au1000_init(void) strcpy(au1000->card->shortname, "Au1000-AC97"); sprintf(au1000->card->longname, "AMD Au1000--AC97 ALSA Driver"); + if ((err = snd_card_set_generic_dev(au1000->card)) < 0) { + snd_card_free(au1000->card); + return err; + } + if ((err = snd_card_register(au1000->card)) < 0) { snd_card_free(au1000->card); return err; |