diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
| commit | 8058e14259ddc8c1824387198fc53700ed4cccc9 (patch) | |
| tree | faffb83ca5173e5f3cbfd4170de603ada4812e23 /drivers/staging/iio | |
| parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
| parent | 7da58046482fceb17c4a0d4afefd9507ec56de7f (diff) | |
| download | op-kernel-dev-8058e14259ddc8c1824387198fc53700ed4cccc9.zip op-kernel-dev-8058e14259ddc8c1824387198fc53700ed4cccc9.tar.gz | |
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/gyro/adis16080_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index fb31b45..c5ceb9d 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c @@ -239,7 +239,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p) struct mxs_lradc *lradc = iio_priv(iio); const uint32_t chan_value = LRADC_CH_ACCUMULATE | ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); - int i, j = 0; + unsigned int i, j = 0; for_each_set_bit(i, iio->active_scan_mask, iio->masklength) { lradc->buffer[j] = readl(lradc->base + LRADC_CH(j)); diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c index 3525a68..41d7350 100644 --- a/drivers/staging/iio/gyro/adis16080_core.c +++ b/drivers/staging/iio/gyro/adis16080_core.c @@ -69,7 +69,7 @@ static int adis16080_spi_read(struct iio_dev *indio_dev, ret = spi_read(st->us, st->buf, 2); if (ret == 0) - *val = ((st->buf[0] & 0xF) << 8) | st->buf[1]; + *val = sign_extend32(((st->buf[0] & 0xF) << 8) | st->buf[1], 11); mutex_unlock(&st->buf_lock); return ret; |
