diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2009-02-16 15:38:37 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:05:25 -0500 |
commit | c2b73d1458014a9f461b75bc1756a699a6c0781f (patch) | |
tree | d869727d6002ebf48fdb875b490108d85c5ff761 /sound/isa/wss | |
parent | 96cf45cf559be375de29dd45afc50fa8946fb2aa (diff) |
ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection
cs4232 and cs4236 driver merge to solve PnP BIOS detection.
Also, the patch adds recognition if the chip is cs4236b+
or earlier part. This unifies drivers for both cs4232
and cs4236+ chips. It allows to use the PnP BIOS
detection for the cs4236+ chips. Previously, only
the snd-cs4232 could be detected by the PnP BIOS.
The cs4232+ cards reports two separate PnP BIOS ids.
The patch adds search for the second id to find out
resources assigned to a control port.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/wss')
-rw-r--r-- | sound/isa/wss/wss_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 8de5deda7ad6..ac27832b2c6f 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c | |||
@@ -1657,7 +1657,7 @@ static void snd_wss_resume(struct snd_wss *chip) | |||
1657 | } | 1657 | } |
1658 | #endif /* CONFIG_PM */ | 1658 | #endif /* CONFIG_PM */ |
1659 | 1659 | ||
1660 | static int snd_wss_free(struct snd_wss *chip) | 1660 | int snd_wss_free(struct snd_wss *chip) |
1661 | { | 1661 | { |
1662 | release_and_free_resource(chip->res_port); | 1662 | release_and_free_resource(chip->res_port); |
1663 | release_and_free_resource(chip->res_cport); | 1663 | release_and_free_resource(chip->res_cport); |
@@ -1680,6 +1680,7 @@ static int snd_wss_free(struct snd_wss *chip) | |||
1680 | kfree(chip); | 1680 | kfree(chip); |
1681 | return 0; | 1681 | return 0; |
1682 | } | 1682 | } |
1683 | EXPORT_SYMBOL(snd_wss_free); | ||
1683 | 1684 | ||
1684 | static int snd_wss_dev_free(struct snd_device *device) | 1685 | static int snd_wss_dev_free(struct snd_device *device) |
1685 | { | 1686 | { |