summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-01-03 22:42:34 +0000
committerDan Williams <dan.j.williams@intel.com>2011-01-04 19:16:13 -0800
commitd6cf7b597f7158616106068930d1c6203d9359eb (patch)
treea1d640957f21926f2f65e96804ecd18f72047413 /drivers/dma
parentb61be8d728abad7fd98e62e98f22325f8f254b51 (diff)
downloadop-kernel-dev-d6cf7b597f7158616106068930d1c6203d9359eb.zip
op-kernel-dev-d6cf7b597f7158616106068930d1c6203d9359eb.tar.gz
ARM: PL08x: use min() to calculate target_len
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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 7c327c3..91dd6bf 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -682,9 +682,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
* If enough left try to send max possible,
* otherwise try to send the remainder
*/
- target_len = remainder;
- if (remainder > max_bytes_per_lli)
- target_len = max_bytes_per_lli;
+ target_len = min(remainder, max_bytes_per_lli);
/*
* Set bus lengths for incrementing buses
OpenPOWER on IntegriCloud