diff options
| author |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-08 12:38:37 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-20 14:51:27 +0200 |
| commit | 33c24f8f5a2716824bb0af959d7eb87c94133cfc (patch) | |
| tree | 454e73714051e521f37ef83fb70b5c2c22485571 /drivers/staging/media | |
| parent | media: atomisp: improve device detection code (diff) | |
| download | wireguard-linux-33c24f8f5a2716824bb0af959d7eb87c94133cfc.tar.xz wireguard-linux-33c24f8f5a2716824bb0af959d7eb87c94133cfc.zip | |
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 <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/sh_css_firmware.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/media/atomisp/pci/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/sh_css_firmware.c index 3ba9a7d09c9a..eb3c01574853 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 |