diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 19:45:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 19:45:58 -0800 |
| commit | 6bb951a0a6212486a3bab3d765c32295f46f24c2 (patch) | |
| tree | 669eee646735ec3029d4c5fd43cef494758b428e /arch | |
| parent | e49aedb594dc9cd4add2f0fd7360952c11017532 (diff) | |
| parent | 947a2462792a89b8aa168a1108288e0d0ae36d12 (diff) | |
| download | kernel_samsung_aries-6bb951a0a6212486a3bab3d765c32295f46f24c2.zip kernel_samsung_aries-6bb951a0a6212486a3bab3d765c32295f46f24c2.tar.gz kernel_samsung_aries-6bb951a0a6212486a3bab3d765c32295f46f24c2.tar.bz2 | |
Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux
* 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux:
ARM: S3C24XX: DMA: Use valid index when accessing array
ARM: S3C: move s3c_pwm_remove to .devexit.text
ARM: S3C24XX: Export s3c24xx_set_fiq for modules.
ARM: S3C: move s3c_adc_remove to .devexit.text
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-s3c/pwm.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/adc.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/irq.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c/pwm.c b/arch/arm/plat-s3c/pwm.c index 4fdc5b3..ef019f2 100644 --- a/arch/arm/plat-s3c/pwm.c +++ b/arch/arm/plat-s3c/pwm.c @@ -368,7 +368,7 @@ static int s3c_pwm_probe(struct platform_device *pdev) return ret; } -static int s3c_pwm_remove(struct platform_device *pdev) +static int __devexit s3c_pwm_remove(struct platform_device *pdev) { struct pwm_device *pwm = platform_get_drvdata(pdev); diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c index df47322..ce47627 100644 --- a/arch/arm/plat-s3c24xx/adc.c +++ b/arch/arm/plat-s3c24xx/adc.c @@ -365,7 +365,7 @@ static int s3c_adc_probe(struct platform_device *pdev) return ret; } -static int s3c_adc_remove(struct platform_device *pdev) +static int __devexit s3c_adc_remove(struct platform_device *pdev) { struct adc_device *adc = platform_get_drvdata(pdev); diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index f65192d..f0ea794 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@ -1403,11 +1403,13 @@ static struct s3c2410_dma_chan *s3c2410_dma_map_channel(int channel) ord = &dma_order->channels[channel]; for (ch = 0; ch < dma_channels; ch++) { + int tmp; if (!is_channel_valid(ord->list[ch])) continue; - if (s3c2410_chans[ord->list[ch]].in_use == 0) { - ch = ord->list[ch] & ~DMA_CH_VALID; + tmp = ord->list[ch] & ~DMA_CH_VALID; + if (s3c2410_chans[tmp].in_use == 0) { + ch = tmp; goto found; } } diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index ef0f521..ad0d44e 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c @@ -522,6 +522,8 @@ int s3c24xx_set_fiq(unsigned int irq, bool on) __raw_writel(intmod, S3C2410_INTMOD); return 0; } + +EXPORT_SYMBOL_GPL(s3c24xx_set_fiq); #endif |