diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-10-07 05:38:09 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-10-10 07:41:53 -0400 |
commit | ff33f2303b0ea8e5ac15af91de8d8538a5d58db1 (patch) | |
tree | 4160cbce65339c8baabca0aefbf5ba79de99188c /include/sound | |
parent | 8ae23ec3ab305b58140462234bddf2257af57bae (diff) |
ALSA: Increase components array size
Increase the card components[] (and thus snd_card_info.components[],
too) array size from 80 to 128 chars so that more strings can be
stored. The 80 chars aren't enough for more than 2 HD-audio codecs,
and this hits an ugly snd_BUG() as reported by Wu Fegguang for HP
2230s.
The control protocol number is increased to 2.0.6 as well, in case
it matters.
Reported-by: Wu Fengguang <wfg@linux.intel.com>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/asound.h | 5 | ||||
-rw-r--r-- | include/sound/core.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 1196e3d5194..2c4dc908a54 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
@@ -707,7 +707,7 @@ struct snd_timer_tread { | |||
707 | * * | 707 | * * |
708 | ****************************************************************************/ | 708 | ****************************************************************************/ |
709 | 709 | ||
710 | #define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5) | 710 | #define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 6) |
711 | 711 | ||
712 | struct snd_ctl_card_info { | 712 | struct snd_ctl_card_info { |
713 | int card; /* card number */ | 713 | int card; /* card number */ |
@@ -718,8 +718,7 @@ struct snd_ctl_card_info { | |||
718 | unsigned char longname[80]; /* name + info text about soundcard */ | 718 | unsigned char longname[80]; /* name + info text about soundcard */ |
719 | unsigned char reserved_[16]; /* reserved for future (was ID of mixer) */ | 719 | unsigned char reserved_[16]; /* reserved for future (was ID of mixer) */ |
720 | unsigned char mixername[80]; /* visual mixer identification */ | 720 | unsigned char mixername[80]; /* visual mixer identification */ |
721 | unsigned char components[80]; /* card components / fine identification, delimited with one space (AC97 etc..) */ | 721 | unsigned char components[128]; /* card components / fine identification, delimited with one space (AC97 etc..) */ |
722 | unsigned char reserved[48]; /* reserved for future */ | ||
723 | }; | 722 | }; |
724 | 723 | ||
725 | typedef int __bitwise snd_ctl_elem_type_t; | 724 | typedef int __bitwise snd_ctl_elem_type_t; |
diff --git a/include/sound/core.h b/include/sound/core.h index f52ab6f3ca6..e5eec5f7350 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -116,7 +116,7 @@ struct snd_card { | |||
116 | char shortname[32]; /* short name of this soundcard */ | 116 | char shortname[32]; /* short name of this soundcard */ |
117 | char longname[80]; /* name of this soundcard */ | 117 | char longname[80]; /* name of this soundcard */ |
118 | char mixername[80]; /* mixer name */ | 118 | char mixername[80]; /* mixer name */ |
119 | char components[80]; /* card components delimited with | 119 | char components[128]; /* card components delimited with |
120 | space */ | 120 | space */ |
121 | struct module *module; /* top-level module */ | 121 | struct module *module; /* top-level module */ |
122 | 122 | ||