diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
commit | 37d7035da5b1f184c610b038b376c0c647d8d72b (patch) | |
tree | c38d4058ad3232f985d9ed4501a8a842a2a47028 /arch/arm/mach-pxa/ssp.c | |
parent | 0fc3ff31f1f0fa023bb61e9336a7aa3591f2dffe (diff) | |
parent | 54b238469bce3a1b5012b2f0ebf261cf1c53e664 (diff) |
Merge branch 'pxa-devel' into pxa
Diffstat (limited to 'arch/arm/mach-pxa/ssp.c')
-rw-r--r-- | arch/arm/mach-pxa/ssp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 0bb31982fb6f..89f38683787e 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
@@ -14,13 +14,6 @@ | |||
14 | * IO-based SSP applications and allows easy port setup for DMA access. | 14 | * IO-based SSP applications and allows easy port setup for DMA access. |
15 | * | 15 | * |
16 | * Author: Liam Girdwood <liam.girdwood@wolfsonmicro.com> | 16 | * Author: Liam Girdwood <liam.girdwood@wolfsonmicro.com> |
17 | * | ||
18 | * Revision history: | ||
19 | * 22nd Aug 2003 Initial version. | ||
20 | * 20th Dec 2004 Added ssp_config for changing port config without | ||
21 | * closing the port. | ||
22 | * 4th Aug 2005 Added option to disable irq handler registration and | ||
23 | * cleaned up irq and clock detection. | ||
24 | */ | 17 | */ |
25 | 18 | ||
26 | #include <linux/module.h> | 19 | #include <linux/module.h> |
@@ -285,7 +278,7 @@ int ssp_init(struct ssp_dev *dev, u32 port, u32 init_flags) | |||
285 | goto out_region; | 278 | goto out_region; |
286 | dev->irq = ssp->irq; | 279 | dev->irq = ssp->irq; |
287 | } else | 280 | } else |
288 | dev->irq = 0; | 281 | dev->irq = NO_IRQ; |
289 | 282 | ||
290 | /* turn on SSP port clock */ | 283 | /* turn on SSP port clock */ |
291 | clk_enable(ssp->clk); | 284 | clk_enable(ssp->clk); |
@@ -306,7 +299,8 @@ void ssp_exit(struct ssp_dev *dev) | |||
306 | struct ssp_device *ssp = dev->ssp; | 299 | struct ssp_device *ssp = dev->ssp; |
307 | 300 | ||
308 | ssp_disable(dev); | 301 | ssp_disable(dev); |
309 | free_irq(dev->irq, dev); | 302 | if (dev->irq != NO_IRQ) |
303 | free_irq(dev->irq, dev); | ||
310 | clk_disable(ssp->clk); | 304 | clk_disable(ssp->clk); |
311 | ssp_free(ssp); | 305 | ssp_free(ssp); |
312 | } | 306 | } |
@@ -360,6 +354,7 @@ static int __devinit ssp_probe(struct platform_device *pdev, int type) | |||
360 | dev_err(&pdev->dev, "failed to allocate memory"); | 354 | dev_err(&pdev->dev, "failed to allocate memory"); |
361 | return -ENOMEM; | 355 | return -ENOMEM; |
362 | } | 356 | } |
357 | ssp->pdev = pdev; | ||
363 | 358 | ||
364 | ssp->clk = clk_get(&pdev->dev, "SSPCLK"); | 359 | ssp->clk = clk_get(&pdev->dev, "SSPCLK"); |
365 | if (IS_ERR(ssp->clk)) { | 360 | if (IS_ERR(ssp->clk)) { |