summaryrefslogtreecommitdiff
authorxindong.xu <xindong.xu@amlogic.com>2018-03-09 07:48:17 (GMT)
committer Gerrit Code Review <gituser@li1005-239.members.linode.com>2018-03-09 07:48:17 (GMT)
commit55f5f421f8c2002b4d88ef8bddead2811a899544 (patch)
tree3dff6084ecc04ea8f12a17219f7b9ea4ab60ef96
parent9f75e456c1e20de2745dba0fc8e580947bcb0fac (diff)
parent4aa6274baac19bb77f89c151f2ec0683f3f68c46 (diff)
downloadampere-55f5f421f8c2002b4d88ef8bddead2811a899544.zip
ampere-55f5f421f8c2002b4d88ef8bddead2811a899544.tar.gz
ampere-55f5f421f8c2002b4d88ef8bddead2811a899544.tar.bz2
Merge "CEC: Can't get correct CEC version [1/1]" into o-amlogic
Diffstat
-rw-r--r--frameworks/services/hdmicec/server/DroidHdmiCec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/frameworks/services/hdmicec/server/DroidHdmiCec.cpp b/frameworks/services/hdmicec/server/DroidHdmiCec.cpp
index e438d20..6bd56e3 100644
--- a/frameworks/services/hdmicec/server/DroidHdmiCec.cpp
+++ b/frameworks/services/hdmicec/server/DroidHdmiCec.cpp
@@ -84,7 +84,7 @@ Return<int32_t> DroidHdmiCec::getCecVersion()
{
int version = 0;
if (NULL != mHdmiCecControl) {
- return mHdmiCecControl->getVersion(&version);
+ mHdmiCecControl->getVersion(&version);
}
if (mDebug)
@@ -97,7 +97,7 @@ Return<uint32_t> DroidHdmiCec::getVendorId()
{
uint32_t vendorId = 0;
if (NULL != mHdmiCecControl) {
- return mHdmiCecControl->getVendorId(&vendorId);
+ mHdmiCecControl->getVendorId(&vendorId);
}
if (mDebug)