Moved code to configure sync to where check enable_sync option before.
There is no need to check enable_sync twice. Configuring sync should be
executed immediately after enabling sync.

Signed-off-by: Sidong Yang <realwa...@gmail.com>
---
v2: remove obvious comment. reordered size/value/enable sync functions.

 drivers/staging/pi433/pi433_if.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 53928af696a6..8fa7b3346170 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -319,6 +319,12 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct 
pi433_tx_cfg *tx_cfg)
        }
 
        if (tx_cfg->enable_sync == OPTION_ON) {
+               ret = rf69_set_sync_size(dev->spi, tx_cfg->sync_length);
+               if (ret < 0)
+                       return ret;
+               ret = rf69_set_sync_values(dev->spi, tx_cfg->sync_pattern);
+               if (ret < 0)
+                       return ret;
                ret = rf69_enable_sync(dev->spi);
                if (ret < 0)
                        return ret;
@@ -348,16 +354,6 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct 
pi433_tx_cfg *tx_cfg)
                        return ret;
        }
 
-       /* configure sync, if enabled */
-       if (tx_cfg->enable_sync == OPTION_ON) {
-               ret = rf69_set_sync_size(dev->spi, tx_cfg->sync_length);
-               if (ret < 0)
-                       return ret;
-               ret = rf69_set_sync_values(dev->spi, tx_cfg->sync_pattern);
-               if (ret < 0)
-                       return ret;
-       }
-
        return 0;
 }
 
-- 
2.17.1

Reply via email to