lkml.org 
[lkml]   [2017]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/2] iio: pressure: mpl3115: do not rely on structure field ordering
From
Date
On 2017-02-01 10:10, Peter Meerwald-Stadler wrote:
> Hello,
>
>> Fixes a regression triggered by a change in the layout of
>> struct iio_chan_spec, but the real bug is in the driver which assumed
>> a specific structure layout in the first place.
>
> I don't think that this is a proper fix
>
> maybe the driver is unique in that it uses mask_separate for INFO_SCALE
> and not by_type, but since there is just one PRESSURE channel, it should
> be equivalent
>
> what do you mean by 'driver which assumed a specific structure'?

Look again, the two bits are not OR:ed together as implied by the
indentation. There is a comma between them, which put the ..._SCALE
bit in the next field. That next field was .info_mask_shared_by_type
before the patch adding the available attribute that triggered the
regression and .info_mask_separate_available after it.

Cheers,
peda

> thanks, p.
>
>> diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
>> index cc3f84139157..525644a7442d 100644
>> --- a/drivers/iio/pressure/mpl3115.c
>> +++ b/drivers/iio/pressure/mpl3115.c
>> @@ -190,7 +190,7 @@ static const struct iio_chan_spec mpl3115_channels[] = {
>> {
>> .type = IIO_PRESSURE,
>> .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
>> - BIT(IIO_CHAN_INFO_SCALE),
>> + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
>> .scan_index = 0,
>> .scan_type = {
>> .sign = 'u',
>> @@ -203,7 +203,7 @@ static const struct iio_chan_spec mpl3115_channels[] = {
>> {
>> .type = IIO_TEMP,
>> .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
>> - BIT(IIO_CHAN_INFO_SCALE),
>> + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
>> .scan_index = 1,
>> .scan_type = {
>> .sign = 's',
>>
>

\
 
 \ /
  Last update: 2017-02-01 10:13    [W:0.065 / U:17.432 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site