1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 3dcdbad65456..ca50a91752d8 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -42,6 +42,10 @@ struct accel_3d_state {
         struct hid_sensor_common common_attributes;
         struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX];
         u32 accel_val[ACCEL_3D_CHANNEL_MAX];
+        int scale_pre_decml;
+        int scale_post_decml;
+        int scale_precision;
+        int value_offset;
 };
 
 static const u32 accel_3d_addresses[ACCEL_3D_CHANNEL_MAX] = {
@@ -123,12 +127,12 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SCALE:
-                *val = accel_state->accel[CHANNEL_SCAN_INDEX_X].units;
-                ret_type = IIO_VAL_INT;
+                *val = accel_state->scale_pre_decml;
+                *val2 = accel_state->scale_post_decml;
+                ret_type = accel_state->scale_precision;
                 break;
         case IIO_CHAN_INFO_OFFSET:
-                *val = hid_sensor_convert_exponent(
-                        accel_state->accel[CHANNEL_SCAN_INDEX_X].unit_expo);
+                *val = accel_state->value_offset;
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
@@ -262,6 +266,11 @@ static int accel_3d_parse_report(struct platform_device *pdev,
                         st->accel[1].index, st->accel[1].report_id,
                         st->accel[2].index, st->accel[2].report_id);
 
+        st->scale_precision = hid_sensor_format_scale(
+                                HID_USAGE_SENSOR_ACCEL_3D,
+                                &st->accel[CHANNEL_SCAN_INDEX_X],
+                                &st->scale_pre_decml, &st->scale_post_decml);
+
         /* Set Sensitivity field ids, when there is no individual modifier */
         if (st->common_attributes.sensitivity.index < 0) {
                 sensor_hub_input_get_attribute_info(hsdev,