staging: pi433: Remove SET_CHECKED usage from pi433_probe

SET_CHECKED returns from the function on failure and in pi433_probe it is
necessary to free the GPIOs and the device on failure.

Signed-off-by: Simon Sandström <simon@nikanor.nu>
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 688d0cf007821e267eb2c75a1b79a2fdc2e96472..55ed45f4599836acb8e2ba4141d4c8417cf9c888 100644 (file)
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -1124,13 +1124,27 @@ static int pi433_probe(struct spi_device *spi)
        }
 
        /* setup the radio module */
-       SET_CHECKED(rf69_set_mode               (spi, standby));
-       SET_CHECKED(rf69_set_data_mode          (spi, DATAMODUL_MODE_PACKET));
-       SET_CHECKED(rf69_enable_amplifier(spi, MASK_PALEVEL_PA0));
-       SET_CHECKED(rf69_disable_amplifier(spi, MASK_PALEVEL_PA1));
-       SET_CHECKED(rf69_disable_amplifier(spi, MASK_PALEVEL_PA2));
-       SET_CHECKED(rf69_set_output_power_level (spi, 13));
-       SET_CHECKED(rf69_set_antenna_impedance  (spi, fiftyOhm));
+       retval = rf69_set_mode(spi, standby);
+       if (retval < 0)
+               goto minor_failed;
+       retval = rf69_set_data_mode(spi, DATAMODUL_MODE_PACKET);
+       if (retval < 0)
+               goto minor_failed;
+       retval = rf69_enable_amplifier(spi, MASK_PALEVEL_PA0);
+       if (retval < 0)
+               goto minor_failed;
+       retval = rf69_disable_amplifier(spi, MASK_PALEVEL_PA1);
+       if (retval < 0)
+               goto minor_failed;
+       retval = rf69_disable_amplifier(spi, MASK_PALEVEL_PA2);
+       if (retval < 0)
+               goto minor_failed;
+       retval = rf69_set_output_power_level(spi, 13);
+       if (retval < 0)
+               goto minor_failed;
+       retval = rf69_set_antenna_impedance(spi, fiftyOhm);
+       if (retval < 0)
+               goto minor_failed;
 
        /* determ minor number */
        retval = pi433_get_minor(device);