From: Andreas Noever <andreas.noever@gmail.com>
Date: Thu, 23 Jan 2014 20:59:21 +0000 (+0100)
Subject: PCI: Increment max correctly in pci_scan_bridge()
X-Git-Tag: v3.15-rc1~143^2~11^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a4d7d87197e3ff9138981e196aa5021d13a51a8;p=pandora-kernel.git

PCI: Increment max correctly in pci_scan_bridge()

This patch fixes two small issues:
 - If pci_add_new_bus() fails, max must not be incremented. Otherwise
   an incorrect value is returned from pci_scan_bridge().
 - If the bus is already present, max must be incremented. I think
   that this case should only be hit if we trigger a manual rescan of a
   CardBus bridge.

Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

Reading git-diff-tree failed