aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@suse.cz>2005-01-04 10:35:21 +0100
committerJaroslav Kysela <perex@suse.cz>2005-01-04 10:35:21 +0100
commit0ac2053fefdf523ae455ad96e29f03b2d99f31bd (patch)
treedf6ab0f83f20b4089335378c0665b984e7b8ea56 /sound
parente36a6e0bb852c0795d64792752161ad764325ba4 (diff)
downloadhistory-0ac2053fefdf523ae455ad96e29f03b2d99f31bd.tar.gz
[ALSA] Fix NULL pointer access
MIXART driver Fixed NULL pointer access when id string isn't given. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/mixart/mixart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 603ffd2d45f435..3acffcb9540a60 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1352,7 +1352,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
idx = index[dev];
else
idx = index[dev] + i;
- snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev], i);
+ snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev] ? id[dev] : "MIXART", i);
card = snd_card_new(idx, tmpid, THIS_MODULE, 0);
if (! card) {