diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-11-08 20:32:24 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 20:32:24 +0300 |
| commit | 91e43395820baad80248987608216c35da9df65b (patch) | |
| tree | 29d41d1a036eb1abd6a60f16ad37aa578acd8159 /drivers/fpga/ice40-spi.c | |
| parent | eef3dc34a1e0b01d53328b88c25237bcc7323777 (diff) | |
| parent | cec83ff1241ec98113a19385ea9e9cfa9aa4125b (diff) | |
| download | linux-91e43395820baad80248987608216c35da9df65b.tar.xz | |
Merge branch 'fixes-dts' into omap-for-v4.20/fixes
Diffstat (limited to 'drivers/fpga/ice40-spi.c')
| -rw-r--r-- | drivers/fpga/ice40-spi.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c index 5981c7ee7a7d..6154661b8f76 100644 --- a/drivers/fpga/ice40-spi.c +++ b/drivers/fpga/ice40-spi.c @@ -175,18 +175,14 @@ static int ice40_fpga_probe(struct spi_device *spi) return ret; } - mgr = fpga_mgr_create(dev, "Lattice iCE40 FPGA Manager", - &ice40_fpga_ops, priv); + mgr = devm_fpga_mgr_create(dev, "Lattice iCE40 FPGA Manager", + &ice40_fpga_ops, priv); if (!mgr) return -ENOMEM; spi_set_drvdata(spi, mgr); - ret = fpga_mgr_register(mgr); - if (ret) - fpga_mgr_free(mgr); - - return ret; + return fpga_mgr_register(mgr); } static int ice40_fpga_remove(struct spi_device *spi) |