diff options
| author | Mark Brown <[email protected]> | 2019-09-15 09:32:04 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2019-09-15 09:32:04 +0000 |
| commit | 262a2f33454fcecdc2032ca84d6fecdb08233468 (patch) | |
| tree | 0689eaf3ef298f1ebd62db89a6c19680e5eb479c /drivers/spi/spi-zynq-qspi.c | |
| parent | Linux 5.3-rc8 (diff) | |
| parent | spi: bcm2835: Work around DONE bit erratum (diff) | |
| download | kernel-262a2f33454fcecdc2032ca84d6fecdb08233468.tar.gz kernel-262a2f33454fcecdc2032ca84d6fecdb08233468.zip | |
Merge branch 'spi-5.3' into spi-linus
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 c6bee67decb5..d812a215ae5c 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -695,7 +695,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; |