lkml.org 
[lkml]   [2021]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 132/157] iio: hid-sensor-humidity: Fix alignment issue of timestamp channel
    Date
    From: Ye Xiang <xiang.ye@intel.com>

    commit 37e89e574dc238a4ebe439543c5ab4fbb2f0311b upstream.

    This patch ensures that, there is sufficient space and correct
    alignment for the timestamp.

    Fixes: d7ed89d5aadf ("iio: hid: Add humidity sensor support")
    Signed-off-by: Ye Xiang <xiang.ye@intel.com>
    Cc: <Stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20210303063615.12130-2-xiang.ye@intel.com
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/iio/humidity/hid-sensor-humidity.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    --- a/drivers/iio/humidity/hid-sensor-humidity.c
    +++ b/drivers/iio/humidity/hid-sensor-humidity.c
    @@ -15,7 +15,10 @@
    struct hid_humidity_state {
    struct hid_sensor_common common_attributes;
    struct hid_sensor_hub_attribute_info humidity_attr;
    - s32 humidity_data;
    + struct {
    + s32 humidity_data;
    + u64 timestamp __aligned(8);
    + } scan;
    int scale_pre_decml;
    int scale_post_decml;
    int scale_precision;
    @@ -125,9 +128,8 @@ static int humidity_proc_event(struct hi
    struct hid_humidity_state *humid_st = iio_priv(indio_dev);

    if (atomic_read(&humid_st->common_attributes.data_ready))
    - iio_push_to_buffers_with_timestamp(indio_dev,
    - &humid_st->humidity_data,
    - iio_get_time_ns(indio_dev));
    + iio_push_to_buffers_with_timestamp(indio_dev, &humid_st->scan,
    + iio_get_time_ns(indio_dev));

    return 0;
    }
    @@ -142,7 +144,7 @@ static int humidity_capture_sample(struc

    switch (usage_id) {
    case HID_USAGE_SENSOR_ATMOSPHERIC_HUMIDITY:
    - humid_st->humidity_data = *(s32 *)raw_data;
    + humid_st->scan.humidity_data = *(s32 *)raw_data;

    return 0;
    default:

    \
     
     \ /
      Last update: 2021-03-22 13:54    [W:4.885 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site