aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-11-12 09:50:28 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-12 09:50:28 +0100
commitf8b7163529831ee3ad6a1aeaa0f1256cb527008d (patch)
tree0f86b5420e6cb1efff31caa0fc6f3ae59d4cdb9d
parenta2f6309e8392e2c14c04594fca8b4876c8c9bc36 (diff)
ALSA: hda - Don't access invalid substream in proc file
The commit e3303235209c0496b490e10ab131e72a9568c153 "ALSA: hda - proc - show which I/O NID is associated to PCM device" introduces the access to substream pointer. But, PCMs may have no substreams in one or both directions, and this results in NULL dereference. Also, print the first substream number doesn't make sense. This patch removes the access to the substream pointer, and reformat to fit to the standard coding style. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_proc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index f5639c2988a..f5b783ce450 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -316,11 +316,11 @@ static void print_audio_io(struct snd_info_buffer *buffer,
for (type = 0; type < 2; type++) {
if (cpcm->stream[type].nid != nid || cpcm->pcm == NULL)
continue;
- snd_iprintf(buffer, " Device: name=\"%s\", type=\"%s\", device=%i, substream=%i\n",
- cpcm->name,
- snd_hda_pcm_type_name[cpcm->pcm_type],
- cpcm->pcm->device,
- cpcm->pcm->streams[type].substream->number);
+ snd_iprintf(buffer, " Device: name=\"%s\", "
+ "type=\"%s\", device=%i\n",
+ cpcm->name,
+ snd_hda_pcm_type_name[cpcm->pcm_type],
+ cpcm->pcm->device);
}
}
conv = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);