summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2009-12-19 14:50:44 +0100
committerMatthias Hopf <mhopf@suse.de>2009-12-28 13:01:59 +0100
commitb62d13fc640b4362ff17c413bf75b8ee4c48ef82 (patch)
tree15c665d68b3578698e298f836d72fca786fd6b00
parentace8f44f6cbd7fd393b5a8a30468471ccee3726c (diff)
Bugfixing and a bit cleanup
Should fix assert in rhd_dig.c and removes RHDHdmiCommitAudioWorkaround, from AllocFree becuase it's later called anyway. Signed-off-by: Matthias Hopf <mhopf@suse.de>
-rw-r--r--src/rhd_atomout.c1
-rw-r--r--src/rhd_dig.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rhd_atomout.c b/src/rhd_atomout.c
index 9f879a8..3ab114e 100644
--- a/src/rhd_atomout.c
+++ b/src/rhd_atomout.c
@@ -878,7 +878,6 @@ RHDAtomOutputAllocFree(struct rhdOutput *Output, enum rhdOutputAllocation Alloc)
Private->Hdmi = RHDHdmiInit(rhdPtr, Output);
RHDHdmiSave(Private->Hdmi);
- RHDHdmiCommitAudioWorkaround(Private->Hdmi);
return TRUE;
case RHD_OUTPUT_FREE:
diff --git a/src/rhd_dig.c b/src/rhd_dig.c
index 3156c37..1fa5cdf 100644
--- a/src/rhd_dig.c
+++ b/src/rhd_dig.c
@@ -1648,8 +1648,8 @@ DigAllocFree(struct rhdOutput *Output, enum rhdOutputAllocation Alloc)
if(Private->EncoderMode == TMDS_DVI || Private->EncoderMode == TMDS_HDMI) {
Private->Hdmi = RHDHdmiInit(rhdPtr, Output);
RHDHdmiSave(Private->Hdmi);
- RHDHdmiCommitAudioWorkaround(Private->Hdmi);
}
+ return TRUE;
case RHD_OUTPUT_FREE:
Private->EncoderID = ENCODER_NONE;
@@ -1664,7 +1664,7 @@ DigAllocFree(struct rhdOutput *Output, enum rhdOutputAllocation Alloc)
RHDHdmiDestroy(Private->Hdmi);
Private->Hdmi = NULL;
return TRUE;
- break;
+
default:
return FALSE;
}