diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2020-09-17 21:12:22 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-09-18 16:31:45 +0300 |
| commit | 5dee5872f87552cfb173c899d35fc1413c2aa77f (patch) | |
| tree | 273a8551247785dbec22d1e7c55e2b636e1c9e8e /drivers/dma/acpi-dma.c | |
| parent | c0a6b5ecc5b7dd028c2921415ea036074a8f8b00 (diff) | |
| parent | 376ceb31ff879c2ee6b48eef841d6fa7720f6f43 (diff) | |
| download | linux-5dee5872f87552cfb173c899d35fc1413c2aa77f.tar.xz | |
Merge branch 'mlx5_active_speed' into rdma.git for-next
Leon Romanovsky says:
====================
IBTA declares speed as 16 bits, but kernel stores it in u8. This series
fixes in-kernel declaration while keeping external interface intact.
====================
Based on the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.
* branch 'mlx5_active_speed':
RDMA: Fix link active_speed size
RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
net/mlx5: Refactor query port speed functions
Diffstat (limited to 'drivers/dma/acpi-dma.c')
| -rw-r--r-- | drivers/dma/acpi-dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c index 35f4804ea4af..235f1396f968 100644 --- a/drivers/dma/acpi-dma.c +++ b/drivers/dma/acpi-dma.c @@ -135,11 +135,13 @@ static void acpi_dma_parse_csrt(struct acpi_device *adev, struct acpi_dma *adma) if (ret < 0) { dev_warn(&adev->dev, "error in parsing resource group\n"); - return; + break; } grp = (struct acpi_csrt_group *)((void *)grp + grp->length); } + + acpi_put_table((struct acpi_table_header *)csrt); } /** |