diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-01-03 17:46:17 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-01-04 22:16:14 -0500 |
commit | b7f758659265c173380b792862aaad1c23c0e004 (patch) | |
tree | b67550bae43e48026c00284a9a64257ef11aae43 /drivers/dma | |
parent | f0fd944625b6e406dc273b8dffa16e0728c973e6 (diff) |
ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels
Prevent dma_set_runtime_config() being used to alter the configuration
supplied by the platform for memcpy channel configuration. No one
should be trying to change this configuration.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/amba-pl08x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index c7f7b82f6155..bebc678ed4fc 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c | |||
@@ -1129,6 +1129,9 @@ static int dma_set_runtime_config(struct dma_chan *chan, | |||
1129 | u32 cctl = 0; | 1129 | u32 cctl = 0; |
1130 | int i; | 1130 | int i; |
1131 | 1131 | ||
1132 | if (!plchan->slave) | ||
1133 | return -EINVAL; | ||
1134 | |||
1132 | /* Transfer direction */ | 1135 | /* Transfer direction */ |
1133 | plchan->runtime_direction = config->direction; | 1136 | plchan->runtime_direction = config->direction; |
1134 | if (config->direction == DMA_TO_DEVICE) { | 1137 | if (config->direction == DMA_TO_DEVICE) { |