On 12.12.2015 16:57, Jonathan Cameron wrote:
On 09/12/15 11:40, Adriana Reus wrote:
When setting als only or proximity only modes make sure that we mark the other
component as disabled.
Signed-off-by: Adriana Reus <adriana.reus@xxxxxxxxx>
Hi Adriana
When you send a fix of any type, please describe the effects of the bug.
That way I have more information to figure out if the bug is tidying up
a loose end or fixing a critical bug and hence judge which path it takes
to upstream.
Long story short it's a tidy up that prevents a bug that would occur
once events are added (patch 2 of this series adds events). The exact
use case is: if user polls proximity px_enabled will be set to true,
user then polls als, and sets the mode to ALS_ONLY, while px_enabled
wrongfully remains true, at this point if events are enabled proximity
won't actually get to be enabled in the chip and will not deliver
events. For this reason it has to be applied before or at the same time
with the patch that adds events and interrupt support.
Please let me know for this one as I can't immediately pick out what the
effects will be.
Jonathan
---
drivers/iio/light/us5182d.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/light/us5182d.c b/drivers/iio/light/us5182d.c
index 256c4bc..f24b687 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
