X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpci%2Fhotplug%2Fpciehp_hpc.c;h=cb0804b2dbca9fd7be8b26b21c38475aaefe8ba7;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=2a68ace539382fadff7446f4fba42a0345832182;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 2a68ace53..cb0804b2d 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -237,8 +237,8 @@ struct php_ctlr_state_s {
 static spinlock_t hpc_event_lock;
 
 DEFINE_DBG_BUFFER		/* Debug string buffer for entire HPC defined here */
-static struct php_ctlr_state_s *php_ctlr_list_head = 0;	/* HPC state linked list */
-static int ctlr_seq_num = 0;	/* Controller sequence # */
+static struct php_ctlr_state_s *php_ctlr_list_head;	/* HPC state linked list */
+static int ctlr_seq_num;	/* Controller sequence # */
 static spinlock_t list_lock;
 
 static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs);
@@ -349,7 +349,9 @@ static int hpc_check_lnk_status(struct controller *ctrl)
 		return retval;
 	}
 
-	if ( (lnk_status & (LNK_TRN | LNK_TRN_ERR)) == 0x0C00) {
+	dbg("%s: lnk_status = %x\n", __FUNCTION__, lnk_status);
+	if ( (lnk_status & LNK_TRN) || (lnk_status & LNK_TRN_ERR) || 
+		!(lnk_status & NEG_LINK_WD)) {
 		err("%s : Link Training Error occurs \n", __FUNCTION__);
 		retval = -1;
 		return retval;
@@ -742,7 +744,7 @@ static void hpc_release_ctlr(struct controller *ctrl)
 		}
 	}
 	if (php_ctlr->pci_dev) 
-		php_ctlr->pci_dev = 0;
+		php_ctlr->pci_dev = NULL;
 
 	spin_lock(&list_lock);
 	p = php_ctlr_list_head;
@@ -1465,7 +1467,7 @@ int pcie_init(struct controller * ctrl,
 	if (php_ctlr_list_head == 0) {
 		php_ctlr_list_head = php_ctlr;
 		p = php_ctlr_list_head;
-		p->pnext = 0;
+		p->pnext = NULL;
 	} else {
 		p = php_ctlr_list_head;