diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-13 01:00:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 01:00:07 -0400 |
| commit | 2bc733e8b443e77db5bb18e1bb8f1c535a92eb8c (patch) | |
| tree | a6985ec4a761efbf2bdbaf7e75110669bf52bc15 /drivers/base/dma-contiguous.c | |
| parent | f5a60d4efc7a3928d6e7d37202a8560ce76cb838 (diff) | |
| parent | 48540058612786d365602f3324ed97f9071092de (diff) | |
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
ARM: i.MX: Fix SSI clock associations for i.MX25/i.MX35
* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: clk-imx35: Fix SSI clock registration
ARM: clk-imx25: Fix SSI clock registration
+ Linux 3.6-rc5
Diffstat (limited to 'drivers/base/dma-contiguous.c')
| -rw-r--r-- | drivers/base/dma-contiguous.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 78efb0306a44..34d94c762a1e 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c | |||
| @@ -250,7 +250,7 @@ int __init dma_declare_contiguous(struct device *dev, unsigned long size, | |||
| 250 | return -EINVAL; | 250 | return -EINVAL; |
| 251 | 251 | ||
| 252 | /* Sanitise input arguments */ | 252 | /* Sanitise input arguments */ |
| 253 | alignment = PAGE_SIZE << max(MAX_ORDER, pageblock_order); | 253 | alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order); |
| 254 | base = ALIGN(base, alignment); | 254 | base = ALIGN(base, alignment); |
| 255 | size = ALIGN(size, alignment); | 255 | size = ALIGN(size, alignment); |
| 256 | limit &= ~(alignment - 1); | 256 | limit &= ~(alignment - 1); |