diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-10 21:04:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-10 21:04:00 -0400 |
| commit | ee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8 (patch) | |
| tree | 8e557460f0cf557d26d5f59991ebffc3402b10e9 /drivers/base/platform.c | |
| parent | aeb24d2fb08653a39abb50281b1ffa2d2a6879ab (diff) | |
| parent | e88a0c2ca81207a75afe5bbb8020541dabf606ac (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
drivers: fix dma_get_required_mask
firmware: provide stubs for the FW_LOADER=n case
nozomi: fix initialization and early flow control access
sysdev: fix problem with sysdev_class being re-registered
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index efaf282c438c..911ec600fe71 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
| @@ -648,7 +648,7 @@ u64 dma_get_required_mask(struct device *dev) | |||
| 648 | high_totalram += high_totalram - 1; | 648 | high_totalram += high_totalram - 1; |
| 649 | mask = (((u64)high_totalram) << 32) + 0xffffffff; | 649 | mask = (((u64)high_totalram) << 32) + 0xffffffff; |
| 650 | } | 650 | } |
| 651 | return mask & *dev->dma_mask; | 651 | return mask; |
| 652 | } | 652 | } |
| 653 | EXPORT_SYMBOL_GPL(dma_get_required_mask); | 653 | EXPORT_SYMBOL_GPL(dma_get_required_mask); |
| 654 | #endif | 654 | #endif |