diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:04 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:04 -0400 |
| commit | 262a2f33454fcecdc2032ca84d6fecdb08233468 (patch) | |
| tree | 0689eaf3ef298f1ebd62db89a6c19680e5eb479c /drivers/spi/spi-zynq-qspi.c | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
| parent | 4c524191c0a21d758b519087c64f84348095e940 (diff) | |
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) | |||
| 695 | ctlr->setup = zynq_qspi_setup_op; | 695 | ctlr->setup = zynq_qspi_setup_op; |
| 696 | ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2; | 696 | ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2; |
| 697 | ctlr->dev.of_node = np; | 697 | ctlr->dev.of_node = np; |
| 698 | ret = spi_register_controller(ctlr); | 698 | ret = devm_spi_register_controller(&pdev->dev, ctlr); |
| 699 | if (ret) { | 699 | if (ret) { |
| 700 | dev_err(&pdev->dev, "spi_register_master failed\n"); | 700 | dev_err(&pdev->dev, "spi_register_master failed\n"); |
| 701 | goto clk_dis_all; | 701 | goto clk_dis_all; |