From b221a13620405d16d43d28077c5b0d803205a700 Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@austin.ibm.com>
Date: Tue, 19 Dec 2006 14:00:34 -0600
Subject: [PATCH] --- yaml --- r: 44765 b: refs/heads/master c:
 bb63ab13515951f4d09b16c9e8bd6e50b0f20d1e h: refs/heads/master i:   44763:
 748c09bd3699a80a4c9b4e8c93623ba7cf10fef2 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kernel/pci_64.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d79a81cbe6b..6a358742bcb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 173935f3619ae99fef0cea1dbe4de9c83d6c8e72
+refs/heads/master: bb63ab13515951f4d09b16c9e8bd6e50b0f20d1e
diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c
index a6b7692c7269..73c59ec49120 100644
--- a/trunk/arch/powerpc/kernel/pci_64.c
+++ b/trunk/arch/powerpc/kernel/pci_64.c
@@ -360,6 +360,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
 	DBG("    class: 0x%x\n", dev->class);
 
 	dev->current_state = 4;		/* unknown power state */
+	dev->error_state = pci_channel_io_normal;
 
 	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
 		/* a PCI-PCI bridge */