From: Mauro Carvalho Chehab Date: Fri, 8 May 2020 10:38:37 +0000 (+0200) Subject: media: atomisp: relax firmware version detection criteria X-Git-Tag: v5.10.7~2096^2~179 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33c24f8f5a2716824bb0af959d7eb87c94133cfc;p=platform%2Fkernel%2Flinux-rpi.git media: atomisp: relax firmware version detection criteria As getting the exact version used by the driver is not easy, let's relax the version detection and hope for the best, producing just a warning. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/atomisp/pci/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/sh_css_firmware.c index 3ba9a7d..eb3c015 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_firmware.c +++ b/drivers/staging/media/atomisp/pci/sh_css_firmware.c @@ -196,13 +196,13 @@ sh_css_check_firmware_version(struct device *dev, const char *fw_data) file_header = &firmware_header->file_header; if (strcmp(file_header->version, release_version) != 0) { - dev_err(dev, "Fw version check failed. Expecting '%s', firmware is '%s'.\n", + dev_err(dev, "Firmware version may not be compatible with this driver\n"); + dev_err(dev, "Expecting version '%s', but firmware is '%s'.\n", release_version, file_header->version); - return false; - } else { - /* firmware version matches */ - return true; } + + /* For now, let's just accept a wrong version, even if wrong */ + return true; } enum ia_css_err