Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit af36107968f1b5faab0e4a0cc44fa4498c63f017

Authored by Guenter Roeck
Committed by Mark Brown
1 parent a0c3652caa
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

spi/coldfire-qspi: Drop extra calls to spi_master_get in suspend/resume functions 

Suspend and resume functions call spi_master_get() without matching
spi_master_put(). The extra references are unnecessary and cause
subsequent module unload attempts to fail, so drop the calls.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/spi/spi-coldfire-qspi.c
Diff comments   View file @ af36107
... ... @@ -540,7 +540,7 @@
540 540 #ifdef CONFIG_PM_SLEEP
541 541 static int mcfqspi_suspend(struct device *dev)
542 542 {
543   - struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
  543 + struct spi_master *master = dev_get_drvdata(dev);
544 544 struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
545 545  
546 546 spi_master_suspend(master);
... ... @@ -552,7 +552,7 @@
552 552  
553 553 static int mcfqspi_resume(struct device *dev)
554 554 {
555   - struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
  555 + struct spi_master *master = dev_get_drvdata(dev);
556 556 struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
557 557  
558 558 spi_master_resume(master);