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

Commit 58e9042f authored by Adriana Reus's avatar Adriana Reus Committed by Jonathan Cameron
Browse files

iio: light: us5182d: Fix enable status inconcistency 



When setting als only or proximity only modes make sure that we mark the
other component as disabled. This fix is in preparation of adding event
support because that will make it possible to switch between one-shot and
continuous modes and not tracking these correctly may cause faulty
behaviour (e.g wrongfully considering px enabled and not setting an
appropriate mode in the chip).

Signed-off-by: default avatarAdriana Reus <adriana.reus@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7d2c2aca

drivers/iio/light/us5182d.c

+12 −4
Original line number Diff line number Diff line
@@ -238,8 +238,12 @@ static int us5182d_als_enable(struct us5182d_data *data) 
	int ret;

	u8 mode;



	if (data->power_mode == US5182D_ONESHOT)

		return us5182d_set_opmode(data, US5182D_ALS_ONLY);

	if (data->power_mode == US5182D_ONESHOT) {

		ret = us5182d_set_opmode(data, US5182D_ALS_ONLY);

		if (ret < 0)

			return ret;

		data->px_enabled = false;

	}



	if (data->als_enabled)

		return 0;
@@ -260,8 +264,12 @@ static int us5182d_px_enable(struct us5182d_data *data) 
	int ret;

	u8 mode;



	if (data->power_mode == US5182D_ONESHOT)

		return us5182d_set_opmode(data, US5182D_PX_ONLY);

	if (data->power_mode == US5182D_ONESHOT) {

		ret = us5182d_set_opmode(data, US5182D_PX_ONLY);

		if (ret < 0)

			return ret;

		data->als_enabled = false;

	}



	if (data->px_enabled)

		return 0;