diff options
| author | Christophe Jaillet | 2018-06-28 03:56:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-07-07 16:55:22 +0200 |
| commit | 122c5770cff2c1df1a2384b68285be2812cd72c1 (patch) | |
| tree | 817c78722f8b85c440a7661dcbdb17e85409fd40 /drivers/fpga | |
| parent | ibmasm: don't write out of bounds in read handler (diff) | |
| download | kernel-qcow2-linux-122c5770cff2c1df1a2384b68285be2812cd72c1.tar.gz kernel-qcow2-linux-122c5770cff2c1df1a2384b68285be2812cd72c1.tar.xz kernel-qcow2-linux-122c5770cff2c1df1a2384b68285be2812cd72c1.zip | |
fpga: altera-cvp: Fix an error handling path in 'altera_cvp_probe()'
If 'fpga_mgr_create()' fails, we should release some resources, as done
in the other error handling path of the function.
Fixes: 7085e2a94f7d ("fpga: manager: change api, don't use drvdata")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Moritz Fischer <mdf@kernel.org>
Acked-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/altera-cvp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c index dd4edd8f22ce..7fa793672a7a 100644 --- a/drivers/fpga/altera-cvp.c +++ b/drivers/fpga/altera-cvp.c @@ -455,8 +455,10 @@ static int altera_cvp_probe(struct pci_dev *pdev, mgr = fpga_mgr_create(&pdev->dev, conf->mgr_name, &altera_cvp_ops, conf); - if (!mgr) - return -ENOMEM; + if (!mgr) { + ret = -ENOMEM; + goto err_unmap; + } pci_set_drvdata(pdev, mgr); |