Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb951a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e49aedb5 947a2462

arch/arm/plat-s3c/pwm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/plat-s3c24xx/adc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/plat-s3c24xx/dma.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

			}

		}

arch/arm/plat-s3c24xx/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -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