diff options
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/dfl-pci.c | 6 | ||||
| -rw-r--r-- | drivers/fpga/zynq-fpga.c | 3 | 
2 files changed, 6 insertions, 3 deletions
| diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c index 89ca292236ad..538755062ab7 100644 --- a/drivers/fpga/dfl-pci.c +++ b/drivers/fpga/dfl-pci.c @@ -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) diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c index ee7765049607..07fa8d9ec675 100644 --- a/drivers/fpga/zynq-fpga.c +++ b/drivers/fpga/zynq-fpga.c @@ -583,7 +583,8 @@ static int zynq_fpga_probe(struct platform_device *pdev)  	priv->clk = devm_clk_get(dev, "ref_clk");  	if (IS_ERR(priv->clk)) { -		dev_err(dev, "input clock not found\n"); +		if (PTR_ERR(priv->clk) != -EPROBE_DEFER) +			dev_err(dev, "input clock not found\n");  		return PTR_ERR(priv->clk);  	} |