]> git.baikalelectronics.ru Git - kernel.git/commit
pci: fix PCI bus allocation alignment handling
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2011 17:53:11 +0000 (10:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2011 17:53:11 +0000 (10:53 -0700)
commit57f052e64a92f1292647500fdce6ad3a369f8f16
treec358fbb6eae26a1c5a2bd478241cbcdfd9aa3124
parentf675774de5573771703f971e2f09ad55073aade5
pci: fix PCI bus allocation alignment handling

In commit ef0f563873d0 ("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 f495eccf9b2d ("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>
drivers/pci/setup-bus.c