diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-07-22 12:42:41 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-07-22 12:42:46 +0300 |
| commit | 8a9b346382056b52cd7ff141ae9f15a0fcfeb13d (patch) | |
| tree | 7b855ed138c412bc27713ea8d3feef8939c954a0 /drivers/fpga | |
| parent | 2b4829edfc1c225c717652153097470529d171db (diff) | |
| parent | d811d29517d1ea05bc159579231652d3ca1c2a01 (diff) | |
| download | linux-8a9b346382056b52cd7ff141ae9f15a0fcfeb13d.tar.xz | |
Merge tag 'v5.4.53' into dev-5.4
This is the 5.4.53 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/dfl-afu-dma-region.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c index 62f924489db5..5942343a5d6e 100644 --- a/drivers/fpga/dfl-afu-dma-region.c +++ b/drivers/fpga/dfl-afu-dma-region.c @@ -61,10 +61,10 @@ static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata, region->pages); if (pinned < 0) { ret = pinned; - goto put_pages; + goto free_pages; } else if (pinned != npages) { ret = -EFAULT; - goto free_pages; + goto put_pages; } dev_dbg(dev, "%d pages pinned\n", pinned); |