summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-fsl-dspi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index d57baf6c2d1e..95d8b929cd52 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -624,10 +624,13 @@ static int dspi_resume(struct device *dev)
624{ 624{
625 struct spi_master *master = dev_get_drvdata(dev); 625 struct spi_master *master = dev_get_drvdata(dev);
626 struct fsl_dspi *dspi = spi_master_get_devdata(master); 626 struct fsl_dspi *dspi = spi_master_get_devdata(master);
627 int ret;
627 628
628 pinctrl_pm_select_default_state(dev); 629 pinctrl_pm_select_default_state(dev);
629 630
630 clk_prepare_enable(dspi->clk); 631 ret = clk_prepare_enable(dspi->clk);
632 if (ret)
633 return ret;
631 spi_master_resume(master); 634 spi_master_resume(master);
632 635
633 return 0; 636 return 0;
@@ -726,7 +729,9 @@ static int dspi_probe(struct platform_device *pdev)
726 dev_err(&pdev->dev, "unable to get clock\n"); 729 dev_err(&pdev->dev, "unable to get clock\n");
727 goto out_master_put; 730 goto out_master_put;
728 } 731 }
729 clk_prepare_enable(dspi->clk); 732 ret = clk_prepare_enable(dspi->clk);
733 if (ret)
734 goto out_master_put;
730 735
731 master->max_speed_hz = 736 master->max_speed_hz =
732 clk_get_rate(dspi->clk) / dspi->devtype_data->max_clock_factor; 737 clk_get_rate(dspi->clk) / dspi->devtype_data->max_clock_factor;