Commit 19a82b85245289d95cde2fb7715fe562ae700f59
1 parent
e533720df3
Exists in
smarc-ti-linux-3.14.y
and in
1 other branch
OMAPDSS: HDMI: Do not abort audio playback when display is turned off
Do not abort audio playback when display is turned off. The audio DMA stops when the display turned off and the audio stream will timeout in couple of seconds unless the display is enabled again in time. Without this patch the audio playback is aborted immediately when display is turned off. Signed-off-by: Jyri Sarha <jsarha@ti.com>
Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff
drivers/video/fbdev/omap2/dss/hdmi4.c
| ... | ... | @@ -395,8 +395,8 @@ |
| 395 | 395 | |
| 396 | 396 | mutex_lock(&hdmi.lock); |
| 397 | 397 | |
| 398 | - if (hdmi.audio_abort_cb) | |
| 399 | - hdmi.audio_abort_cb(&hdmi.pdev->dev); | |
| 398 | + /* If set hdmi.audio_abort_cb(&hdmi.pdev->dev) should be | |
| 399 | + * called here, if audio abort functionality is needed. */ | |
| 400 | 400 | |
| 401 | 401 | hdmi_power_off_full(dssdev); |
| 402 | 402 |
drivers/video/fbdev/omap2/dss/hdmi5.c
| ... | ... | @@ -423,8 +423,8 @@ |
| 423 | 423 | |
| 424 | 424 | mutex_lock(&hdmi.lock); |
| 425 | 425 | |
| 426 | - if (hdmi.audio_abort_cb) | |
| 427 | - hdmi.audio_abort_cb(&hdmi.pdev->dev); | |
| 426 | + /* If set hdmi.audio_abort_cb(&hdmi.pdev->dev) should be | |
| 427 | + * called here, if audio abort functionality is needed. */ | |
| 428 | 428 | |
| 429 | 429 | hdmi_power_off_full(dssdev); |
| 430 | 430 |