From 79904dea9a2da974ca8aa1f657c9f6cf2b8575dc Mon Sep 17 00:00:00 2001 From: Divy Le Ray Date: Sun, 9 Nov 2008 00:55:28 -0800 Subject: [PATCH] --- yaml --- r: 118883 b: refs/heads/master c: 9f64306b8a3949b74cb11d3b2f613e8a2af20fa6 h: refs/heads/master i: 118881: fb6af31058623fb9a5ce808003b47280b71ca7cf 118879: 1bbc577a862b5a38b8358b1ac991671d90c97ae8 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/t3_hw.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c0467d08d46..f6543b084974 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c2f5fa51e1b22db53acf4f3918b6f590b4a35a1 +refs/heads/master: 9f64306b8a3949b74cb11d3b2f613e8a2af20fa6 diff --git a/trunk/drivers/net/cxgb3/t3_hw.c b/trunk/drivers/net/cxgb3/t3_hw.c index 968f64be3743..9a0898b0dbce 100644 --- a/trunk/drivers/net/cxgb3/t3_hw.c +++ b/trunk/drivers/net/cxgb3/t3_hw.c @@ -572,7 +572,7 @@ struct t3_vpd { u32 pad; /* for multiple-of-4 sizing and alignment */ }; -#define EEPROM_MAX_POLL 4 +#define EEPROM_MAX_POLL 40 #define EEPROM_STAT_ADDR 0x4000 #define VPD_BASE 0xc00 @@ -3690,6 +3690,12 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, ; pti = &port_types[adapter->params.vpd.port_type[j]]; + if (!pti->phy_prep) { + CH_ALERT(adapter, "Invalid port type index %d\n", + adapter->params.vpd.port_type[j]); + return -EINVAL; + } + ret = pti->phy_prep(&p->phy, adapter, ai->phy_base_addr + j, ai->mdio_ops); if (ret)