diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
| commit | 835d39fcb56cba00b78c60634d6bb0f046ef601c (patch) | |
| tree | 235cecc646bada5c0b76836d42e44e7a5d93c0f8 /drivers/spi/spi_s3c24xx.c | |
| parent | 89bad5892abca55f56d0ea713c7306d1f845ac8e (diff) | |
| parent | ecd68853b852cdafb138f9c437f3a751fe7dc381 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/spi/spi_s3c24xx.c')
| -rw-r--r-- | drivers/spi/spi_s3c24xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 9de4b5a04d70..5fc14563ee3a 100644 --- 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) | |||
| 405 | 405 | ||
| 406 | static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg) | 406 | static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg) |
| 407 | { | 407 | { |
| 408 | struct s3c24xx_spi *hw = platform_get_drvdata(dev); | 408 | struct s3c24xx_spi *hw = platform_get_drvdata(pdev); |
| 409 | 409 | ||
| 410 | clk_disable(hw->clk); | 410 | clk_disable(hw->clk); |
| 411 | return 0; | 411 | return 0; |
| @@ -413,7 +413,7 @@ static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg) | |||
| 413 | 413 | ||
| 414 | static int s3c24xx_spi_resume(struct platform_device *pdev) | 414 | static int s3c24xx_spi_resume(struct platform_device *pdev) |
| 415 | { | 415 | { |
| 416 | struct s3c24xx_spi *hw = platform_get_drvdata(dev); | 416 | struct s3c24xx_spi *hw = platform_get_drvdata(pdev); |
| 417 | 417 | ||
| 418 | clk_enable(hw->clk); | 418 | clk_enable(hw->clk); |
| 419 | return 0; | 419 | return 0; |