diff options
Diffstat (limited to 'drivers/spi/spi-coldfire-qspi.c')
| -rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index b2d4b9e4e01..764bfee7592 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c @@ -533,7 +533,6 @@ static int __devexit mcfqspi_remove(struct platform_device *pdev)  	iounmap(mcfqspi->iobase);  	release_mem_region(res->start, resource_size(res));  	spi_unregister_master(master); -	spi_master_put(master);  	return 0;  } @@ -541,7 +540,7 @@ static int __devexit mcfqspi_remove(struct platform_device *pdev)  #ifdef CONFIG_PM_SLEEP  static int mcfqspi_suspend(struct device *dev)  { -	struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); +	struct spi_master *master = dev_get_drvdata(dev);  	struct mcfqspi *mcfqspi = spi_master_get_devdata(master);  	spi_master_suspend(master); @@ -553,7 +552,7 @@ static int mcfqspi_suspend(struct device *dev)  static int mcfqspi_resume(struct device *dev)  { -	struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); +	struct spi_master *master = dev_get_drvdata(dev);  	struct mcfqspi *mcfqspi = spi_master_get_devdata(master);  	spi_master_resume(master);  |