Commit 14dbdad1 authored by Paulo Miguel Almeida's avatar Paulo Miguel Almeida Committed by Greg Kroah-Hartman
Browse files

staging: pi433: change order in which driver config the rf69 chip 



There is an explicit dependency between modulation and bit rate
configurations. To ensure proper validation of input value for the
set_bit_rate routine, we must ensure that modulation has been set
before.

This patch ensures that set_modulation is always called before
set_bit_rate for both RX and TX routines

Acked-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPaulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com>
Link: https://lore.kernel.org/r/20220118230502.GA4897@mail.google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9dc6c1b

drivers/staging/pi433/pi433_if.c

+4 −4
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) 
	ret = rf69_set_frequency(dev->spi, rx_cfg->frequency);

	if (ret < 0)

		return ret;

	ret = rf69_set_bit_rate(dev->spi, rx_cfg->bit_rate);

	ret = rf69_set_modulation(dev->spi, rx_cfg->modulation);

	if (ret < 0)

		return ret;

	ret = rf69_set_modulation(dev->spi, rx_cfg->modulation);

	ret = rf69_set_bit_rate(dev->spi, rx_cfg->bit_rate);

	if (ret < 0)

		return ret;

	ret = rf69_set_antenna_impedance(dev->spi, rx_cfg->antenna_impedance);
@@ -287,10 +287,10 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) 
	ret = rf69_set_frequency(dev->spi, tx_cfg->frequency);

	if (ret < 0)

		return ret;

	ret = rf69_set_bit_rate(dev->spi, tx_cfg->bit_rate);

	ret = rf69_set_modulation(dev->spi, tx_cfg->modulation);

	if (ret < 0)

		return ret;

	ret = rf69_set_modulation(dev->spi, tx_cfg->modulation);

	ret = rf69_set_bit_rate(dev->spi, tx_cfg->bit_rate);

	if (ret < 0)

		return ret;

	ret = rf69_set_deviation(dev->spi, tx_cfg->dev_frequency);