linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iio: light: tcs3414: Fix misindented lines
@ 2015-01-15 22:25 Roberta Dobrescu
  2015-01-16  9:38 ` Daniel Baluta
  0 siblings, 1 reply; 3+ messages in thread
From: Roberta Dobrescu @ 2015-01-15 22:25 UTC (permalink / raw)
  To: linux-iio, jic23
  Cc: octavian.purdila, daniel.baluta, lars, Michael.Hennerich,
	knaack.h, pmeerw, Roberta Dobrescu

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
---
 drivers/iio/light/tcs3414.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
index a9e449b..71c2bde 100644
--- a/drivers/iio/light/tcs3414.c
+++ b/drivers/iio/light/tcs3414.c
@@ -149,8 +149,8 @@ static int tcs3414_read_raw(struct iio_dev *indio_dev,
 		*val = ret;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-	i = (data->gain & TCS3414_GAIN_MASK) >> TCS3414_GAIN_SHIFT;
-	*val = tcs3414_scales[i][0];
+		i = (data->gain & TCS3414_GAIN_MASK) >> TCS3414_GAIN_SHIFT;
+		*val = tcs3414_scales[i][0];
 		*val2 = tcs3414_scales[i][1];
 		return IIO_VAL_INT_PLUS_MICRO;
 	case IIO_CHAN_INFO_INT_TIME:
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] iio: light: tcs3414: Fix misindented lines
  2015-01-15 22:25 [PATCH] iio: light: tcs3414: Fix misindented lines Roberta Dobrescu
@ 2015-01-16  9:38 ` Daniel Baluta
  2015-01-16 22:50   ` Jonathan Cameron
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Baluta @ 2015-01-16  9:38 UTC (permalink / raw)
  To: Roberta Dobrescu
  Cc: linux-iio@vger.kernel.org, Jonathan Cameron,
	octavian.purdila@intel.com, Daniel Baluta, Lars-Peter Clausen,
	Michael.Hennerich, Hartmut Knaack, Peter Meerwald

On Fri, Jan 16, 2015 at 12:25 AM, Roberta Dobrescu
<roberta.dobrescu@gmail.com> wrote:
> Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>

Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>

> ---
>  drivers/iio/light/tcs3414.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
> index a9e449b..71c2bde 100644
> --- a/drivers/iio/light/tcs3414.c
> +++ b/drivers/iio/light/tcs3414.c
> @@ -149,8 +149,8 @@ static int tcs3414_read_raw(struct iio_dev *indio_dev,
>                 *val = ret;
>                 return IIO_VAL_INT;
>         case IIO_CHAN_INFO_SCALE:
> -       i = (data->gain & TCS3414_GAIN_MASK) >> TCS3414_GAIN_SHIFT;
> -       *val = tcs3414_scales[i][0];
> +               i = (data->gain & TCS3414_GAIN_MASK) >> TCS3414_GAIN_SHIFT;
> +               *val = tcs3414_scales[i][0];
>                 *val2 = tcs3414_scales[i][1];
>                 return IIO_VAL_INT_PLUS_MICRO;
>         case IIO_CHAN_INFO_INT_TIME:
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] iio: light: tcs3414: Fix misindented lines
  2015-01-16  9:38 ` Daniel Baluta
@ 2015-01-16 22:50   ` Jonathan Cameron
  0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2015-01-16 22:50 UTC (permalink / raw)
  To: Daniel Baluta, Roberta Dobrescu
  Cc: linux-iio@vger.kernel.org, octavian.purdila@intel.com,
	Lars-Peter Clausen, Michael.Hennerich, Hartmut Knaack,
	Peter Meerwald

On 16/01/15 09:38, Daniel Baluta wrote:
> On Fri, Jan 16, 2015 at 12:25 AM, Roberta Dobrescu
> <roberta.dobrescu@gmail.com> wrote:
>> Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
> 
> Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Applied to a branch that will get pushed out as testing and at probably
then rebased so I'm not lagging quite so far behind mainline...

Anyhow, it'll hit togreg sometime soonish!

Thanks,

Jonathan
> 
>> ---
>>  drivers/iio/light/tcs3414.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
>> index a9e449b..71c2bde 100644
>> --- a/drivers/iio/light/tcs3414.c
>> +++ b/drivers/iio/light/tcs3414.c
>> @@ -149,8 +149,8 @@ static int tcs3414_read_raw(struct iio_dev *indio_dev,
>>                 *val = ret;
>>                 return IIO_VAL_INT;
>>         case IIO_CHAN_INFO_SCALE:
>> -       i = (data->gain & TCS3414_GAIN_MASK) >> TCS3414_GAIN_SHIFT;
>> -       *val = tcs3414_scales[i][0];
>> +               i = (data->gain & TCS3414_GAIN_MASK) >> TCS3414_GAIN_SHIFT;
>> +               *val = tcs3414_scales[i][0];
>>                 *val2 = tcs3414_scales[i][1];
>>                 return IIO_VAL_INT_PLUS_MICRO;
>>         case IIO_CHAN_INFO_INT_TIME:
>> --
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-01-17 13:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-15 22:25 [PATCH] iio: light: tcs3414: Fix misindented lines Roberta Dobrescu
2015-01-16  9:38 ` Daniel Baluta
2015-01-16 22:50   ` Jonathan Cameron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).