diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:35:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:35:30 +0100 |
| commit | d38e781ea035456c742605fb21d0dd3c755b7b0b (patch) | |
| tree | 53bda2561a47f747ab4caf1119993cc181780db7 /drivers/iio/accel | |
| parent | mei: Move uuid_le_cmp() to its only user (diff) | |
| parent | Linux 6.2-rc7 (diff) | |
| download | linux-d38e781ea035456c742605fb21d0dd3c755b7b0b.tar.xz linux-d38e781ea035456c742605fb21d0dd3c755b7b0b.zip | |
Merge 6.2-rc7 into char-misc-next
We need the char-misc driver fixes in here as other patches depend on
them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel')
| -rw-r--r-- | drivers/iio/accel/hid-sensor-accel-3d.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c index a2def6f9380a..5eac7ea19993 100644 --- a/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/drivers/iio/accel/hid-sensor-accel-3d.c @@ -280,6 +280,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev, hid_sensor_convert_timestamp( &accel_state->common_attributes, *(int64_t *)raw_data); + ret = 0; break; default: break; |