From: Linus Torvalds Date: Mon, 11 Apr 2011 17:53:11 +0000 (-0700) Subject: pci: fix PCI bus allocation alignment handling X-Git-Tag: v2.6.39-rc3~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b42282e5a05018ecdc0d63a4ad530b0999785912;p=pandora-kernel.git 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 Acked-by: Ram Pai Acked-by: Jesse Barnes Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed