diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2009-11-04 23:44:20 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-11-09 18:50:39 -0500 |
commit | 210012a6cd8770a73d1aa74b742667b462d04511 (patch) | |
tree | c3a1c556222de34be855711b252ea467f77aaf20 /arch/arm/plat-s3c64xx | |
parent | 799dd75b1a8380a967c929a4551895788c374b31 (diff) |
ARM: S3C64XX: DMA: Protect buffer pointers while manipulation
Ensure the DMA buffer points are not updated from
another source during the process of enquing a buffer.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
[ben-linux@fluff.org: Updated patch comment]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c64xx')
-rw-r--r-- | arch/arm/plat-s3c64xx/dma.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c64xx/dma.c b/arch/arm/plat-s3c64xx/dma.c index 266a10745a85..6fa706f0f42a 100644 --- a/arch/arm/plat-s3c64xx/dma.c +++ b/arch/arm/plat-s3c64xx/dma.c | |||
@@ -339,6 +339,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, | |||
339 | struct s3c64xx_dma_buff *next; | 339 | struct s3c64xx_dma_buff *next; |
340 | struct s3c64xx_dma_buff *buff; | 340 | struct s3c64xx_dma_buff *buff; |
341 | struct pl080s_lli *lli; | 341 | struct pl080s_lli *lli; |
342 | unsigned long flags; | ||
342 | int ret; | 343 | int ret; |
343 | 344 | ||
344 | WARN_ON(!chan); | 345 | WARN_ON(!chan); |
@@ -366,6 +367,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, | |||
366 | 367 | ||
367 | s3c64xx_dma_fill_lli(chan, lli, data, size); | 368 | s3c64xx_dma_fill_lli(chan, lli, data, size); |
368 | 369 | ||
370 | local_irq_save(flags); | ||
371 | |||
369 | if ((next = chan->next) != NULL) { | 372 | if ((next = chan->next) != NULL) { |
370 | struct s3c64xx_dma_buff *end = chan->end; | 373 | struct s3c64xx_dma_buff *end = chan->end; |
371 | struct pl080s_lli *endlli = end->lli; | 374 | struct pl080s_lli *endlli = end->lli; |
@@ -397,6 +400,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, | |||
397 | s3c64xx_lli_to_regs(chan, lli); | 400 | s3c64xx_lli_to_regs(chan, lli); |
398 | } | 401 | } |
399 | 402 | ||
403 | local_irq_restore(flags); | ||
404 | |||
400 | show_lli(lli); | 405 | show_lli(lli); |
401 | 406 | ||
402 | dbg_showchan(chan); | 407 | dbg_showchan(chan); |