Commit 2d3008f6 authored Apr 23, 2020 by Greg Kroah-Hartman

Merge tag 'fpga-fixes-for-5.7' of...

Merge tag 'fpga-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga

 into char-misc-linus

Moritz writes:

FPGA Manager fixes for 5.7-rc1

Here are two (late) fixes for 5.7-rc1 merge window.

Xu's change addresses an issue with a wrong return value.

Shubhrajyoti's change makes the Zynq FPGA driver return -EPROBE_DEFER on

All patches have been reviewed on the mailing list, and have been in the
last few linux-next releases (as part of my for-next branch) without issues.

Signed-off-by: Moritz Fischer <mdf@kernel.org>

* tag 'fpga-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  fpga: dfl: pci: fix return value of cci_pci_sriov_configure
  fpga: zynq: Remove clk_get error message for probe defer

parents fec874a8 3c2760b7

drivers/fpga/dfl-pci.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -248,11 +248,13 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)
		return ret;

		ret = pci_enable_sriov(pcidev, num_vfs);
		if (ret)
		if (ret) {
		dfl_fpga_cdev_config_ports_pf(cdev);
		return ret;
		}
		}

		return ret;
		return num_vfs;
		}

		static void cci_pci_remove(struct pci_dev *pcidev)

drivers/fpga/zynq-fpga.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -583,6 +583,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)

		priv->clk = devm_clk_get(dev, "ref_clk");
		if (IS_ERR(priv->clk)) {
		if (PTR_ERR(priv->clk) != -EPROBE_DEFER)
		dev_err(dev, "input clock not found\n");
		return PTR_ERR(priv->clk);
		}

Admin message