diff options
| author | Dmitry Torokhov <[email protected]> | 2023-02-21 19:19:49 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-02-21 19:19:49 +0000 |
| commit | 7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 (patch) | |
| tree | dbdd35328f43569c38c4ce193cefd7d2b6b9fbfd /drivers/fpga/zynq-fpga.c | |
| parent | Input: i8042 - add Clevo PCX0DX to i8042 quirk table (diff) | |
| parent | dt-bindings: input: iqs626a: Redefine trackpad property types (diff) | |
| download | kernel-7ae9fb1b7ecbb5d85d07857943f677fd1a559b18.tar.gz kernel-7ae9fb1b7ecbb5d85d07857943f677fd1a559b18.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.3 merge window.
Diffstat (limited to 'drivers/fpga/zynq-fpga.c')
| -rw-r--r-- | drivers/fpga/zynq-fpga.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c index 426aa34c6a0d..ae0da361e6c6 100644 --- a/drivers/fpga/zynq-fpga.c +++ b/drivers/fpga/zynq-fpga.c @@ -582,11 +582,9 @@ static int zynq_fpga_probe(struct platform_device *pdev) return priv->irq; 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); - } + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "input clock not found\n"); err = clk_prepare_enable(priv->clk); if (err) { |