Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / spi / spi_s3c24xx.c

diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 9de4b5a04d70f20d34698a7750544467e0ef31ff..5fc14563ee3a98f523c277be23246074d2407849 100644 (file)
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -405,7 +405,7 @@ static int s3c24xx_spi_remove(struct platform_device *dev)
 
 static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
 {
-       struct s3c24xx_spi *hw = platform_get_drvdata(dev);
+       struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
        clk_disable(hw->clk);
        return 0;
@@ -413,7 +413,7 @@ static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
 
 static int s3c24xx_spi_resume(struct platform_device *pdev)
 {
-       struct s3c24xx_spi *hw = platform_get_drvdata(dev);
+       struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
        clk_enable(hw->clk);
        return 0;