diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-11-25 14:27:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-11-25 14:27:41 +0100 |
| commit | 09578eacaaa44149738267083ccc050990409f86 (patch) | |
| tree | cf614ee065fe5479e4638abebe12c9e1578b09d9 /drivers/iio/imu/adis_buffer.c | |
| parent | ALSA: aloop: Fix dependency on timer API (diff) | |
| parent | Merge branch 'asoc-5.5' into asoc-next (diff) | |
| download | linux-09578eacaaa44149738267083ccc050990409f86.tar.xz linux-09578eacaaa44149738267083ccc050990409f86.zip | |
Merge tag 'asoc-v5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: More updates for v5.5
Some more development work for v5.5. Highlights include:
- More cleanups from Morimoto-san.
- Trigger word detection for RT5677.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/iio/imu/adis_buffer.c')
| -rw-r--r-- | drivers/iio/imu/adis_buffer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c index 9ac8356d9a95..4998a89d083d 100644 --- a/drivers/iio/imu/adis_buffer.c +++ b/drivers/iio/imu/adis_buffer.c @@ -35,8 +35,11 @@ static int adis_update_scan_mode_burst(struct iio_dev *indio_dev, return -ENOMEM; adis->buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL); - if (!adis->buffer) + if (!adis->buffer) { + kfree(adis->xfer); + adis->xfer = NULL; return -ENOMEM; + } tx = adis->buffer + burst_length; tx[0] = ADIS_READ_REG(adis->burst->reg_cmd); @@ -78,8 +81,11 @@ int adis_update_scan_mode(struct iio_dev *indio_dev, return -ENOMEM; adis->buffer = kcalloc(indio_dev->scan_bytes, 2, GFP_KERNEL); - if (!adis->buffer) + if (!adis->buffer) { + kfree(adis->xfer); + adis->xfer = NULL; return -ENOMEM; + } rx = adis->buffer; tx = rx + scan_count; |