[media] rc: nuvoton: fix hang if chip is configured for alternative EFM IO address

If a system configures the Nuvoton chip to use the alternative
EFM IO address (CR_EFIR2) then after probing the primary EFM IO
address (CR_EFIR) this region is not released.

If a driver for another function of the Nuvoton Super I/O
chip uses the same probing mechanism then it will hang if
loaded after the nuvoton-cir driver.
This was reported for the nct6775 hwmon driver.

Fix this by properly releasing the region after probing CR_EFIR.
This regression was introduced with kernel 4.6 so cc it to stable.

Reported-by: Antti Seppälä <[email protected]>
Signed-off-by: Heiner Kallweit <[email protected]>
Tested-by: Antti Seppälä <[email protected]>
Cc: <[email protected]> # 4.6.x-
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
This commit is contained in:
Heiner Kallweit 2016-07-07 03:17:39 -03:00 • committed by Mauro Carvalho Chehab
commit 5cac1f67ea

View file

@ -393,6 +393,7 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
/* Check if we're wired for the alternate EFER setup */
nvt->chip_major = nvt_cr_read(nvt, CR_CHIP_ID_HI);
if (nvt->chip_major == 0xff) {
nvt_efm_disable(nvt);
nvt->cr_efir = CR_EFIR2;
nvt->cr_efdr = CR_EFDR2;
nvt_efm_enable(nvt);