diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-08-23 12:00:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-23 12:00:22 +0100 |
| commit | 795227660d05e109b57896e2df1de0f012c64662 (patch) | |
| tree | 063c92088ee4c90b006a3b7e5c8f7837280694f7 /drivers/spi/spi-zynq-qspi.c | |
| parent | spi: spi-fsl-qspi: Add ls2080a compatibility string to bindings (diff) | |
| parent | spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours (diff) | |
| download | wireguard-linux-795227660d05e109b57896e2df1de0f012c64662.tar.xz wireguard-linux-795227660d05e109b57896e2df1de0f012c64662.zip | |
Merge branch 'spi-5.3' into spi-5.4
Diffstat (limited to 'drivers/spi/spi-zynq-qspi.c')
| -rw-r--r-- | drivers/spi/spi-zynq-qspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c index 3155e2cabb1e..4a5326ccf65a 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -694,7 +694,7 @@ static int zynq_qspi_probe(struct platform_device *pdev) ctlr->setup = zynq_qspi_setup_op; ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2; ctlr->dev.of_node = np; - ret = spi_register_controller(ctlr); + ret = devm_spi_register_controller(&pdev->dev, ctlr); if (ret) { dev_err(&pdev->dev, "spi_register_master failed\n"); goto clk_dis_all; |