diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /drivers/fpga/of-fpga-region.c | |
parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/fpga/of-fpga-region.c')
-rw-r--r-- | drivers/fpga/of-fpga-region.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c index 35fabb8083fb..052a1342ab7e 100644 --- a/drivers/fpga/of-fpga-region.c +++ b/drivers/fpga/of-fpga-region.c | |||
@@ -437,9 +437,10 @@ eprobe_mgr_put: | |||
437 | static int of_fpga_region_remove(struct platform_device *pdev) | 437 | static int of_fpga_region_remove(struct platform_device *pdev) |
438 | { | 438 | { |
439 | struct fpga_region *region = platform_get_drvdata(pdev); | 439 | struct fpga_region *region = platform_get_drvdata(pdev); |
440 | struct fpga_manager *mgr = region->mgr; | ||
440 | 441 | ||
441 | fpga_region_unregister(region); | 442 | fpga_region_unregister(region); |
442 | fpga_mgr_put(region->mgr); | 443 | fpga_mgr_put(mgr); |
443 | 444 | ||
444 | return 0; | 445 | return 0; |
445 | } | 446 | } |