diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:49:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:49:13 +0100 |
| commit | 70c673a48072ff73425b82800479e66f918b8718 (patch) | |
| tree | b8a98710f97ff69c51fa5ba158f403059fd30632 /sound/oss/soundcard.c | |
| parent | 10528020d7323778b60c2de04754a2615a88d002 (diff) | |
| parent | e03fa055bc126e536c7f65862e08a9b143138ea9 (diff) | |
| download | talos-op-linux-70c673a48072ff73425b82800479e66f918b8718.tar.gz talos-op-linux-70c673a48072ff73425b82800479e66f918b8718.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/oss/soundcard.c')
| -rw-r--r-- | sound/oss/soundcard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 46c0d03dbecc..fcb14a099822 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -87,7 +87,7 @@ int *load_mixer_volumes(char *name, int *levels, int present) int i, n; for (i = 0; i < num_mixer_volumes; i++) { - if (strcmp(name, mixer_vols[i].name) == 0) { + if (strncmp(name, mixer_vols[i].name, 32) == 0) { if (present) mixer_vols[i].num = i; return mixer_vols[i].levels; @@ -99,7 +99,7 @@ int *load_mixer_volumes(char *name, int *levels, int present) } n = num_mixer_volumes++; - strcpy(mixer_vols[n].name, name); + strncpy(mixer_vols[n].name, name, 32); if (present) mixer_vols[n].num = n; |
