* [PATCH] fpga: region: Fix some error handling
@ 2017-04-27 9:13 Dan Carpenter
2017-04-27 14:34 ` Alan Tull
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2017-04-27 9:13 UTC (permalink / raw)
To: kernel-janitors
We need to release some resources if fpga_region_get_manager() fails.
Fixes: 0fa20cdfcc1f ("fpga: fpga-region: device tree control for FPGA")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index ae4c61aada99..3b6b2f4182a1 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -245,7 +245,8 @@ static int fpga_region_program_fpga(struct fpga_region *region,
mgr = fpga_region_get_manager(region);
if (IS_ERR(mgr)) {
pr_err("failed to get fpga region manager\n");
- return PTR_ERR(mgr);
+ ret = PTR_ERR(mgr);
+ goto err_put_region;
}
ret = fpga_region_get_bridges(region, overlay);
@@ -281,6 +282,7 @@ static int fpga_region_program_fpga(struct fpga_region *region,
fpga_bridges_put(®ion->bridge_list);
err_put_mgr:
fpga_mgr_put(mgr);
+err_put_region:
fpga_region_put(region);
return ret;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fpga: region: Fix some error handling
2017-04-27 9:13 [PATCH] fpga: region: Fix some error handling Dan Carpenter
@ 2017-04-27 14:34 ` Alan Tull
0 siblings, 0 replies; 2+ messages in thread
From: Alan Tull @ 2017-04-27 14:34 UTC (permalink / raw)
To: kernel-janitors
On Thu, Apr 27, 2017 at 4:13 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
Hi Dan,
Thanks but this fix is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit?idç3bbf64907c88d3bb811756fc25548131524035
Alan
> We need to release some resources if fpga_region_get_manager() fails.
>
> Fixes: 0fa20cdfcc1f ("fpga: fpga-region: device tree control for FPGA")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
> index ae4c61aada99..3b6b2f4182a1 100644
> --- a/drivers/fpga/fpga-region.c
> +++ b/drivers/fpga/fpga-region.c
> @@ -245,7 +245,8 @@ static int fpga_region_program_fpga(struct fpga_region *region,
> mgr = fpga_region_get_manager(region);
> if (IS_ERR(mgr)) {
> pr_err("failed to get fpga region manager\n");
> - return PTR_ERR(mgr);
> + ret = PTR_ERR(mgr);
> + goto err_put_region;
> }
>
> ret = fpga_region_get_bridges(region, overlay);
> @@ -281,6 +282,7 @@ static int fpga_region_program_fpga(struct fpga_region *region,
> fpga_bridges_put(®ion->bridge_list);
> err_put_mgr:
> fpga_mgr_put(mgr);
> +err_put_region:
> fpga_region_put(region);
>
> return ret;
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-27 14:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-27 9:13 [PATCH] fpga: region: Fix some error handling Dan Carpenter
2017-04-27 14:34 ` Alan Tull
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.