Merge branch 'master' into for-4.20/upstream-fixes

Pull in a merge commit that brought in 3b692c55e58d ("HID: asus: only
support backlight when it's not driven by WMI") so that fixup could be
applied on top of it.

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c
index 8d1945966533..469486be20c4 100644
--- a/drivers/fpga/xilinx-spi.c
+++ b/drivers/fpga/xilinx-spi.c
@@ -144,7 +144,6 @@ static int xilinx_spi_probe(struct spi_device *spi)
 {
         struct xilinx_spi_conf *conf;
         struct fpga_manager *mgr;
-        int ret;
 
         conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
         if (!conf)
@@ -167,18 +166,15 @@ static int xilinx_spi_probe(struct spi_device *spi)
                 return PTR_ERR(conf->done);
         }
 
-        mgr = fpga_mgr_create(&spi->dev, "Xilinx Slave Serial FPGA Manager",
-                              &xilinx_spi_ops, conf);
+        mgr = devm_fpga_mgr_create(&spi->dev,
+                                   "Xilinx Slave Serial FPGA Manager",
+                                   &xilinx_spi_ops, conf);
         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 xilinx_spi_remove(struct spi_device *spi)