staging: pi433: Fix rf69_set_tx_cfg() logic

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 <realwakka@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index e822f87fc533b68a6862e58215495d53edfc7f45..ab90d6f80931816c77888ed691adcb6fdafd92c8 100644 (file)
--- 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;
 }