qla3xxx: Don't sleep while holding lock.
authorRon Mercer <ron.mercer@qlogic.com>
Tue, 23 Jun 2009 09:00:02 +0000 (09:00 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jun 2009 23:36:27 +0000 (16:36 -0700)
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qla3xxx.c

index 68be714d356fe13b8e008eb1042ab41a52423204..3e4b67aaa6ea5bddeee06f372d5925bf394466ce 100644 (file)
@@ -3142,6 +3142,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;
@@ -3351,7 +3352,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) {