---

yaml --- r: 259175 b: refs/heads/master c: a8e616b h: refs/heads/master i: 259173: afa5c8f 259171: ac9f53f 259167: f5f0c05 v: v3
git-mirror · Jul 12, 2011 · 31b9b81 · 31b9b81
1 parent 66143a1
commit 31b9b81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9661534d6ad75f881d8bbeb73dd7372f41cbad99
+refs/heads/master: a8e616b9a41212655042f59c969f30bb7de1ec73
diff --git a/trunk/arch/powerpc/sysdev/ppc4xx_pci.c b/trunk/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -679,9 +679,6 @@ static int __init ppc4xx_pciex_wait_on_sdr(struct ppc4xx_pciex_port *port,
 
 static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port)
 {
-	printk(KERN_INFO "PCIE%d: Checking link...\n",
-	       port->index);
-
 	/* Wait for reset to complete */
 	if (ppc4xx_pciex_wait_on_sdr(port, PESDRn_RCSSTS, 1 << 20, 0, 10)) {
 		printk(KERN_WARNING "PCIE%d: PGRST failed\n",
@@ -693,6 +690,8 @@ static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port)
 
 static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port)
 {
+	printk(KERN_INFO "PCIE%d: Checking link...\n", port->index);
+
 	/* Check for card presence detect if supported, if not, just wait for
 	 * link unconditionally.
 	 *