[media] drivers/media: nuvoton: fix chip id probe v2

Make sure we have a matching chip id high and one or the other
of the chip id low values.
Print the values if the probe fails.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 7fca6d1549ed..dd4caf8ef80b 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -248,9 +248,12 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
         chip_minor = nvt_cr_read(nvt, CR_CHIP_ID_LO);
         nvt_dbg("%s: chip id: 0x%02x 0x%02x", chip_id, chip_major, chip_minor);
 
-        if (chip_major != CHIP_ID_HIGH &&
-            (chip_minor != CHIP_ID_LOW || chip_minor != CHIP_ID_LOW2))
+        if (chip_major != CHIP_ID_HIGH ||
+            (chip_minor != CHIP_ID_LOW && chip_minor != CHIP_ID_LOW2)) {
+                nvt_pr(KERN_ERR, "%s: unsupported chip, id: 0x%02x 0x%02x",
+                       chip_id, chip_major, chip_minor);
                 ret = -ENODEV;
+        }
 
         nvt_efm_disable(nvt);