diff options
| author | Nicolas Kaiser | 2010-11-19 21:42:40 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-12-29 11:16:57 +0100 |
| commit | 5df465df7bd9c352289ca63d4d9f78299be72c7d (patch) | |
| tree | 5f4df5aacb907c38acc34265bff818b1caa84d5e /drivers/media/rc/nuvoton-cir.c | |
| parent | [media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata (diff) | |
| download | kernel-qcow2-linux-5df465df7bd9c352289ca63d4d9f78299be72c7d.tar.gz kernel-qcow2-linux-5df465df7bd9c352289ca63d4d9f78299be72c7d.tar.xz kernel-qcow2-linux-5df465df7bd9c352289ca63d4d9f78299be72c7d.zip | |
[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>
Diffstat (limited to 'drivers/media/rc/nuvoton-cir.c')
| -rw-r--r-- | drivers/media/rc/nuvoton-cir.c | 7 |
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); |