diff options
| author | Dan Murphy | 2015-06-17 08:42:52 -0500 |
|---|---|---|
| committer | Dan Murphy | 2015-06-17 08:42:52 -0500 |
| commit | e19ba3d996f22ad8cc7187b30c18347aba0d594d (patch) | |
| tree | 9d38e1a4910e0a309ad1a707e7b218a5f0c45208 | |
| parent | 63819001bfe0376eb569cb4e8774d7f1ff02bc79 (diff) | |
| parent | 19a82b85245289d95cde2fb7715fe562ae700f59 (diff) | |
| download | kernel-video-ti2014.10.03.tar.gz kernel-video-ti2014.10.03.tar.xz kernel-video-ti2014.10.03.zip | |
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-3.14.yti2014.10.03
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>
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi4.c | 4 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi5.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c index f3e43eff0ee..45925d1fd4e 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c | |||
| @@ -395,8 +395,8 @@ static void hdmi_display_disable(struct omap_dss_device *dssdev) | |||
| 395 | 395 | ||
| 396 | mutex_lock(&hdmi.lock); | 396 | mutex_lock(&hdmi.lock); |
| 397 | 397 | ||
| 398 | if (hdmi.audio_abort_cb) | 398 | /* If set hdmi.audio_abort_cb(&hdmi.pdev->dev) should be |
| 399 | hdmi.audio_abort_cb(&hdmi.pdev->dev); | 399 | * called here, if audio abort functionality is needed. */ |
| 400 | 400 | ||
| 401 | hdmi_power_off_full(dssdev); | 401 | hdmi_power_off_full(dssdev); |
| 402 | 402 | ||
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index 14c0d611a19..8863adef981 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c | |||
| @@ -423,8 +423,8 @@ static void hdmi_display_disable(struct omap_dss_device *dssdev) | |||
| 423 | 423 | ||
| 424 | mutex_lock(&hdmi.lock); | 424 | mutex_lock(&hdmi.lock); |
| 425 | 425 | ||
| 426 | if (hdmi.audio_abort_cb) | 426 | /* If set hdmi.audio_abort_cb(&hdmi.pdev->dev) should be |
| 427 | hdmi.audio_abort_cb(&hdmi.pdev->dev); | 427 | * called here, if audio abort functionality is needed. */ |
| 428 | 428 | ||
| 429 | hdmi_power_off_full(dssdev); | 429 | hdmi_power_off_full(dssdev); |
| 430 | 430 | ||