diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-09-05 11:19:20 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-09-12 04:42:01 -0400 |
commit | 43bcd973d6d05d16b876e09dcc49a09d3e48e88d (patch) | |
tree | 8c8493b66c417402f6188051c57e55099bbd156d /sound/isa/opti9xx | |
parent | 16dab54b8cbac39bd3f639db5d7d0fd8300a6cb0 (diff) |
[ALSA] Add snd_card_set_generic_dev() call to ISA drivers
ISA,CMI8330 driver,ES18xx driver,OPL3SA2 driver,Sound Galaxy driver
Sound Scape driver,AD1848 driver,CS4231 driver,CS4236+ driver
ES1688 driver,GUS Classic driver,GUS Extreme driver,GUS MAX driver
AMD InterWave driver,Opti9xx drivers,SB16/AWE driver,SB8 driver
Wavefront drivers
- 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/isa/opti9xx')
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 782750d62ebb..a490bcacdfa8 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -1894,8 +1894,8 @@ static void snd_card_opti9xx_free(snd_card_t *card) | |||
1894 | } | 1894 | } |
1895 | } | 1895 | } |
1896 | 1896 | ||
1897 | static int __devinit snd_card_opti9xx_probe(struct pnp_card_link *pcard, | 1897 | static int snd_card_opti9xx_probe(struct pnp_card_link *pcard, |
1898 | const struct pnp_card_device_id *pid) | 1898 | const struct pnp_card_device_id *pid) |
1899 | { | 1899 | { |
1900 | static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1}; | 1900 | static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1}; |
1901 | static long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1}; | 1901 | static long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1}; |
@@ -1965,6 +1965,10 @@ static int __devinit snd_card_opti9xx_probe(struct pnp_card_link *pcard, | |||
1965 | snd_card_free(card); | 1965 | snd_card_free(card); |
1966 | return error; | 1966 | return error; |
1967 | } | 1967 | } |
1968 | if ((error = snd_card_set_generic_dev(card)) < 0) { | ||
1969 | snd_card_free(card); | ||
1970 | return error; | ||
1971 | } | ||
1968 | #ifdef CONFIG_PNP | 1972 | #ifdef CONFIG_PNP |
1969 | } | 1973 | } |
1970 | #endif /* CONFIG_PNP */ | 1974 | #endif /* CONFIG_PNP */ |