diff options
| author |   Jonathan Cameron <jic23@kernel.org> | 2012-06-30 10:14:29 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2012-06-30 10:14:29 +0100 |
| commit | c1f1a9d48fd18cd380858637fda1c69732547e1f (patch) | |
| tree | a0973498293f0f10d448021d7192889db9a956ee /drivers/staging/iio/accel/adis16240_core.c | |
| parent | staging: gdm72xx: fix an skb memory leak (diff) | |
| parent | staging:iio: Add some missing peak elements to the info_mask (diff) | |
| download | linux-dev-c1f1a9d48fd18cd380858637fda1c69732547e1f.tar.xz linux-dev-c1f1a9d48fd18cd380858637fda1c69732547e1f.zip | |
Merge branch 'fixes-togreg' into togreg
Diffstat (limited to 'drivers/staging/iio/accel/adis16240_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/adis16240_core.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c index 2f59f83d002d..1a51f03d3d76 100644 --- a/drivers/staging/iio/accel/adis16240_core.c +++ b/drivers/staging/iio/accel/adis16240_core.c @@ -500,7 +500,8 @@ static struct iio_chan_spec adis16240_channels[] = { .channel2 = IIO_MOD_X, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | IIO_CHAN_INFO_SCALE_SHARED_BIT | - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, + IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | + IIO_CHAN_INFO_PEAK_SEPARATE_BIT, .address = accel_x, .scan_index = ADIS16240_SCAN_ACC_X, .scan_type = { @@ -514,7 +515,8 @@ static struct iio_chan_spec adis16240_channels[] = { .channel2 = IIO_MOD_Y, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | IIO_CHAN_INFO_SCALE_SHARED_BIT | - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, + IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | + IIO_CHAN_INFO_PEAK_SEPARATE_BIT, .address = accel_y, .scan_index = ADIS16240_SCAN_ACC_Y, .scan_type = { @@ -528,7 +530,8 @@ static struct iio_chan_spec adis16240_channels[] = { .channel2 = IIO_MOD_Z, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | IIO_CHAN_INFO_SCALE_SHARED_BIT | - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, + IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | + IIO_CHAN_INFO_PEAK_SEPARATE_BIT, .address = accel_z, .scan_index = ADIS16240_SCAN_ACC_Z, .scan_type = { |