Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54fc95a7 authored by Simon Sandström's avatar Simon Sandström Committed by Greg Kroah-Hartman
Browse files

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: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 534a2610

drivers/staging/pi433/pi433_if.c

+21 −7
Original line number Diff line number Diff line
@@ -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);