diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 08:07:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 08:07:00 -0400 |
| commit | 6e03f99803195e5aaf7f247db31b0d11857ccc35 (patch) | |
| tree | ffd4b1a140854977e984a4390105333845c0e90c /drivers/pci/hotplug/pciehp_hpc.c | |
| parent | 982162602b31041b426edec6480d327743abcbcc (diff) | |
| parent | 6bfb09a1005193be5c81ebac9f3ef85210142650 (diff) | |
Merge branch 'linus' into x86/iommu
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index ab31f5ba665d..9d934ddee956 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
| @@ -258,7 +258,7 @@ static int pcie_poll_cmd(struct controller *ctrl) | |||
| 258 | return 1; | 258 | return 1; |
| 259 | } | 259 | } |
| 260 | } | 260 | } |
| 261 | while (timeout > 1000) { | 261 | while (timeout > 0) { |
| 262 | msleep(10); | 262 | msleep(10); |
| 263 | timeout -= 10; | 263 | timeout -= 10; |
| 264 | if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) { | 264 | if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) { |