| Message ID | 1245783602-6542-2-git-send-email-ron.mercer@qlogic.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Ron Mercer <ron.mercer@qlogic.com> Date: Tue, 23 Jun 2009 12:00:02 -0700 > Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index d9e3835..56333ee 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -3143,6 +3143,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) (void __iomem *)port_regs; u32 delay = 10; int status = 0; + unsigned long hw_flags = 0; if(ql_mii_setup(qdev)) return -1; @@ -3352,7 +3353,9 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) value = ql_read_page0_reg(qdev, &port_regs->portStatus); if (value & PORT_STATUS_IC) break; + spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); msleep(500); + spin_lock_irqsave(&qdev->hw_lock, hw_flags); } while (--delay); if (delay == 0) {
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> --- drivers/net/qla3xxx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)