diff options
| author | Dominik Brodowski <[email protected]> | 2009-12-20 09:50:02 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-12-21 18:42:29 +0000 |
| commit | 0e2c8b8f55072a98b99e7bdad55c912084d6a526 (patch) | |
| tree | 80c1ab46950ba15ed04ff6f8a6b8a032d6fbeafa /lib/string.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-0e2c8b8f55072a98b99e7bdad55c912084d6a526.tar.gz kernel-0e2c8b8f55072a98b99e7bdad55c912084d6a526.zip | |
resources: fix call to alignf() in allocate_resource()
The second parameter to alignf() in allocate_resource() must
reflect what new resource is attempted to be allocated, else
functions like pcibios_align_resource() (at least on x86) or
pcmcia_align() can't work correctly.
Commit 1e5ad9679016275d422e36b12a98b0927d76f556 broke this by
setting the "new" resource until we're about to return success.
To keep the resource untouched when allocate_resource() fails,
a "tmp" resource is introduced.
Signed-off-by: Dominik Brodowski <[email protected]>
Acked-by: Bjorn Helgaas <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Jesse Barnes <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'lib/string.c')
0 files changed, 0 insertions, 0 deletions
