| Message ID | 20200529200031.4117841-6-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] staging: media: atomisp: fix incorrect NULL pointer check | expand |
diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c index 2a23b7c6aeeb..10d698295daf 100644 --- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c @@ -1704,7 +1704,7 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_binary_find() [%d] continue: !%d\n", __LINE__, - binary_supports_input_format(xcandidate, req_in_info->format)); + binary_supports_input_format(xcandidate, descr->stream_format)); continue; } #endif
The caller passes a variable of a different enum type: drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c:1707:64: error: implicit conversion from enumeration type 'const enum ia_css_frame_format' to different enumeration type 'enum atomisp_input_format' [-Werror,-Wenum-conversion] binary_supports_input_format(xcandidate, req_in_info->format)); An earlier patch tried to address this by changing the type of the function argument, but as the caller passes two different arguments, there is still a warning. Assume that the last patch was correct and change the other caller as well. Fixes: 0116b8df1c9e ("media: staging: atomisp: stop duplicating input format types") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)