summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Shaposhnikov <x0166637@ti.com>2013-06-12 04:54:22 -0500
committerRoman Shaposhnikov <x0166637@ti.com>2013-06-12 04:54:22 -0500
commitac9f346edaa5ed62b5bfdb412a4de7c8849162e7 (patch)
tree5f32739c3df04ea5e8a1f57c20486c159b17d986
parent9da66a66441ed6bc5d77fa2caadf078c53763c51 (diff)
parent5d355bd7506a78019435846e51d1b52834d7adb8 (diff)
downloadcommon-open-ac9f346edaa5ed62b5bfdb412a4de7c8849162e7.tar.gz
Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release
-rw-r--r--audio/hdmi_audio_hw.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/audio/hdmi_audio_hw.c b/audio/hdmi_audio_hw.c
index 18b9f6f..8b2315a 100644
--- a/audio/hdmi_audio_hw.c
+++ b/audio/hdmi_audio_hw.c
@@ -401,7 +401,11 @@ ssize_t hdmi_out_write(struct audio_stream_out *stream, const void* buffer,
}
exit:
if (ret != 0) {
- ALOGE("Error writing to HDMI pcm: %s", pcm_get_error(out->pcm));
+ if (out->pcm) {
+ ALOGE("Error writing to HDMI pcm: %s", pcm_get_error(out->pcm));
+ } else {
+ ALOGE("Error: pcm == 0, err = %d", ret);
+ }
hdmi_out_standby((struct audio_stream*)stream);
unsigned int usecs = bytes * 1000000 /
audio_stream_frame_size((struct audio_stream*)stream) /