diff options
-rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index 8d594c6704ad..94d817523d5f 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c | |||
@@ -473,8 +473,11 @@ static int mcfqspi_suspend(struct device *dev) | |||
473 | { | 473 | { |
474 | struct spi_master *master = dev_get_drvdata(dev); | 474 | struct spi_master *master = dev_get_drvdata(dev); |
475 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); | 475 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); |
476 | int ret; | ||
476 | 477 | ||
477 | spi_master_suspend(master); | 478 | ret = spi_master_suspend(master); |
479 | if (ret) | ||
480 | return ret; | ||
478 | 481 | ||
479 | clk_disable(mcfqspi->clk); | 482 | clk_disable(mcfqspi->clk); |
480 | 483 | ||
@@ -486,11 +489,9 @@ static int mcfqspi_resume(struct device *dev) | |||
486 | struct spi_master *master = dev_get_drvdata(dev); | 489 | struct spi_master *master = dev_get_drvdata(dev); |
487 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); | 490 | struct mcfqspi *mcfqspi = spi_master_get_devdata(master); |
488 | 491 | ||
489 | spi_master_resume(master); | ||
490 | |||
491 | clk_enable(mcfqspi->clk); | 492 | clk_enable(mcfqspi->clk); |
492 | 493 | ||
493 | return 0; | 494 | return spi_master_resume(master); |
494 | } | 495 | } |
495 | #endif | 496 | #endif |
496 | 497 | ||