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

Commit 75ed2687 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

pcmcia: fix return value of soc_pcmcia_regulator_set 



The newly introduced soc_pcmcia_regulator_set() function sometimes
returns without setting its return code, as shown by this warning:

  drivers/pcmcia/soc_common.c: In function 'soc_pcmcia_regulator_set':
  drivers/pcmcia/soc_common.c:112:5: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This changes it to propagate the regulator_disable() result instead.

Fixes: ac61b600 ("pcmcia: soc_common: add support for Vcc and Vpp regulators")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c50e90d0

drivers/pcmcia/soc_common.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ int soc_pcmcia_regulator_set(struct soc_pcmcia_socket *skt, 


		ret = regulator_enable(r->reg);

	} else {

		regulator_disable(r->reg);

		ret = regulator_disable(r->reg);

	}

	if (ret == 0)

		r->on = on;