File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -850,12 +850,6 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
850
850
if (!fsl_lpspi -> is_slave )
851
851
controller -> use_gpio_descriptors = true;
852
852
853
- ret = devm_spi_register_controller (& pdev -> dev , controller );
854
- if (ret < 0 ) {
855
- dev_err (& pdev -> dev , "spi_register_controller error.\n" );
856
- goto out_controller_put ;
857
- }
858
-
859
853
init_completion (& fsl_lpspi -> xfer_done );
860
854
861
855
res = platform_get_resource (pdev , IORESOURCE_MEM , 0 );
@@ -913,6 +907,12 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
913
907
if (ret < 0 )
914
908
dev_err (& pdev -> dev , "dma setup error %d, use pio\n" , ret );
915
909
910
+ ret = devm_spi_register_controller (& pdev -> dev , controller );
911
+ if (ret < 0 ) {
912
+ dev_err (& pdev -> dev , "spi_register_controller error.\n" );
913
+ goto out_pm_get ;
914
+ }
915
+
916
916
pm_runtime_mark_last_busy (fsl_lpspi -> dev );
917
917
pm_runtime_put_autosuspend (fsl_lpspi -> dev );
918
918
You can’t perform that action at this time.
0 commit comments