aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2022-08-15 21:31:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-15 21:31:56 +0000
commitd7ff18e03460268e42e859b86feaa25d1d1c06e5 (patch)
treee9ea5c0d94d3e557c9dc9b89445dab7038a2d3cf
parentdacabf034e5d7b3ae825bd1f3ad83f85b35bd7ad (diff)
parent786c188d002d06beb8c996468a85d07ff2f1d24e (diff)
downloadtinycompress-d7ff18e03460268e42e859b86feaa25d1d1c06e5.tar.gz
Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d am: 786c188d00
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162 Change-Id: I841ebce73c25d49d987976e1746fcf3d74931db1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--compress.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/compress.c b/compress.c
index 7422c4b..ac2c73f 100644
--- a/compress.c
+++ b/compress.c
@@ -574,9 +574,11 @@ bool is_codec_supported(unsigned int card, unsigned int device,
ops = &compr_hw_ops;
fd = ops->open(card, device, flags, &data, NULL);
- if (fd < 0)
- return oops(&bad_compress, errno, "cannot open card %u, device %u",
+ if (fd < 0) {
+ oops(&bad_compress, errno, "cannot open card %u, device %u",
card, device);
+ return false;
+ }
ret = _is_codec_type_supported(ops, data, codec);