redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Nicolas Kaiser 2010-11-19 17:42:40 -03:00 committed by Mauro Carvalho Chehab
parent ecfc95eb74
commit 5df465df7b
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/rc/nuvoton-cir.c
View file

@ -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);