diff options
| author | Christopher Ferris <cferris@google.com> | 2022-08-15 21:49:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-15 21:49:24 +0000 |
| commit | c532332a09662b797f49b52c1c9f9cc6f329d97b (patch) | |
| tree | e9ea5c0d94d3e557c9dc9b89445dab7038a2d3cf | |
| parent | dacabf034e5d7b3ae825bd1f3ad83f85b35bd7ad (diff) | |
| parent | d7ff18e03460268e42e859b86feaa25d1d1c06e5 (diff) | |
| download | tinycompress-c532332a09662b797f49b52c1c9f9cc6f329d97b.tar.gz | |
Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d am: 786c188d00 am: d7ff18e034android-u-beta-1-gplmain-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162
Change-Id: Ie46cd9ba0b0acc98dc70d5c4914b2ffdbc8f37e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | compress.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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); |