Messages in this thread Patch in this message | | | Date | Wed, 17 Nov 2010 11:35:25 +0100 | From | Nicolas Kaiser <> | Subject | [PATCH] drivers/media: nuvoton: fix chip id probe |
| |
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> --- Like this? Supersedes patch "drivers/media: nuvoton: always true expression".
drivers/media/IR/nuvoton-cir.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/media/IR/nuvoton-cir.c b/drivers/media/IR/nuvoton-cir.c index 301be53..92d32c8 100644 --- a/drivers/media/IR/nuvoton-cir.c +++ b/drivers/media/IR/nuvoton-cir.c @@ -249,9 +249,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: chip id mismatch: 0x%02x 0x%02x", + chip_id, chip_major, chip_minor); ret = -ENODEV; + } nvt_efm_disable(nvt); -- 1.7.2.2
| |