media: radio: Tuning bugfix for si470x over i2c

PATCH Superseded Douglas Fischer 1 participant 1 message Feb 26, 2018

Subsystems (2)

Media (V4L/DVB) SI470X FM radio receiver USB driver

lore

Share & tools

lore

Douglas Fischer

author

2018-02-26 02:24 UTC #0 lore raw

PATCH v3 1/1 media: radio: Tuning bugfix for si470x over i2c

Fixed si470x_set_channel() trying to tune before chip is turned on, which causes warnings in dmesg and when probing, makes driver wait for 3s for tuning timeout. This issue did not affect USB devices because they have a different probing sequence.

Changed from v2: radio power check returns if power is off instead of putting the rest of the function in the conditional.

Signed-off-by Douglas Fischer <[email protected]>

---

drivers/media/radio/si470x/radio-si470x-common.c +9 -0

diff -uprN linux.orig/drivers/media/radio/si470x/radio-si470x-common.c linux/drivers/media/radio/si470x/radio-si470x-common.c
@@ -207,6 +207,15 @@ static int si470x_set_chan(struct si470x
 	unsigned long time_left;
 	bool timed_out = false;
 
+	retval = si470x_get_register(radio, POWERCFG);
+	if (retval)
+		return retval;
+
+	if ( (radio->registers[POWERCFG] & (POWERCFG_ENABLE|POWERCFG_DMUTE))
+		!= (POWERCFG_ENABLE|POWERCFG_DMUTE) ) {
+		return 0;
+	}
+
 	/* start tuning */
 	radio->registers[CHANNEL] &= ~CHANNEL_CHAN;
 	radio->registers[CHANNEL] |= CHANNEL_TUNE | chan;