From: Adriana Reus Date: Mon, 14 Dec 2015 12:24:45 +0000 (+0200) Subject: iio: light: us5182d: Fix enable status inconcistency X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=58e9042f5f130bf3f9043cf75aa2632fc12140e6;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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: Adriana Reus Signed-off-by: Jonathan Cameron --- diff --git a/drivers/iio/light/us5182d.c b/drivers/iio/light/us5182d.c index 256c4bc12d21..f24b687bd152 100644 --- a/drivers/iio/light/us5182d.c +++ b/drivers/iio/light/us5182d.c @@ -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;