Commit e19ba3d996f22ad8cc7187b30c18347aba0d594d
Exists in
smarc-ti-linux-3.14.y
and in
1 other branch
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-lin…
…ux-kernel/audio-display-linux-feature-tree into ti-linux-3.14.y TI-Feature: audio-display TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git TI-Branch: audio-display-ti-linux-3.14.y * 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree: OMAPDSS: HDMI: Do not abort audio playback when display is turned off Signed-off-by: Dan Murphy <DMurphy@ti.com>
Showing 2 changed files 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 |