commit 5df465df7bd9c352289ca63d4d9f78299be72c7d
author Nicolas Kaiser <nikai@nikai.net> Fri Nov 19 17:42:40 2010 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Wed Dec 29 08:16:57 2010 -0200
tree 5f4df5aacb907c38acc34265bff818b1caa84d5e
parent ecfc95eb7410c04c23f59b02931e8f8b3aa4a5b3

[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>

drivers/media/rc/nuvoton-cir.c

diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 7fca6d1..dd4caf8 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -248,9 +248,12 @@
 	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);