summaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-11 19:53:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-11 19:53:11 +0200
commitb42282e5a05018ecdc0d63a4ad530b0999785912 (patch)
treec358fbb6eae26a1c5a2bd478241cbcdfd9aa3124 /drivers/base/power
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-b42282e5a05018ecdc0d63a4ad530b0999785912.tar.xz
linux-b42282e5a05018ecdc0d63a4ad530b0999785912.zip
pci: fix PCI bus allocation alignment handling
In commit 13583b16592a ("PCI: refactor io size calculation code") Ram had a thinko in the refactorization of the code: the end result used the variable 'align' for the bus alignment, but the original code used 'min_align'. Since then, another use of that 'align' variable got introduced by commit c8adf9a3e873 ("PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.") Fix both of those uses to use 'min_align' as they should. Daniel Hellstrom <daniel@gaisler.com> Acked-by: Ram Pai <linuxram@us.ibm.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base/power')
0 files changed, 0 insertions, 0 deletions