diff options
| author | Paolo Bonzini <[email protected]> | 2024-09-14 09:33:46 -0400 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2024-09-15 02:43:11 -0400 |
| commit | 1a371190a375f98c9b106f758ea41558c3f92556 (patch) | |
| tree | c57d5c913ad355360a5a6b7f7f1e74f1539ddd25 /drivers/iio/buffer/industrialio-buffer-dmaengine.c | |
| parent | 091b2ecaa3081b8dee90c4fb31e782e8e3107a77 (diff) | |
| parent | 3abb708ec0be25da16a1ee9f1ab5cbc93f3256f3 (diff) | |
Merge tag 'loongarch-kvm-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD
LoongArch KVM changes for v6.12
1. Revert qspinlock to test-and-set simple lock on VM.
2. Add Loongson Binary Translation extension support.
3. Add PMU support for guest.
4. Enable paravirt feature control from VMM.
5. Implement function kvm_para_has_feature().
Diffstat (limited to 'drivers/iio/buffer/industrialio-buffer-dmaengine.c')
| -rw-r--r-- | drivers/iio/buffer/industrialio-buffer-dmaengine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c index 12aa1412dfa0..426cc614587a 100644 --- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c +++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c @@ -237,7 +237,7 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev, ret = dma_get_slave_caps(chan, &caps); if (ret < 0) - goto err_free; + goto err_release; /* Needs to be aligned to the maximum of the minimums */ if (caps.src_addr_widths) @@ -263,6 +263,8 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev, return &dmaengine_buffer->queue.buffer; +err_release: + dma_release_channel(chan); err_free: kfree(dmaengine_buffer); return ERR_PTR(ret); |