xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'spi-5.3' into spi-5.4

Browse Source
This commit is contained in:
Mark Brown
2019-08-23 12:00:22 +01:00
parent be28f76b7e d41f36a646
commit 795227660d
8 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-zynq-qspi.c
View File

@@ -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;