|
@@ -3017,7 +3017,6 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
|
|
(void __iomem *)port_regs;
|
|
(void __iomem *)port_regs;
|
|
u32 delay = 10;
|
|
u32 delay = 10;
|
|
int status = 0;
|
|
int status = 0;
|
|
- unsigned long hw_flags = 0;
|
|
|
|
|
|
|
|
if (ql_mii_setup(qdev))
|
|
if (ql_mii_setup(qdev))
|
|
return -1;
|
|
return -1;
|
|
@@ -3228,9 +3227,9 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
|
|
value = ql_read_page0_reg(qdev, &port_regs->portStatus);
|
|
value = ql_read_page0_reg(qdev, &port_regs->portStatus);
|
|
if (value & PORT_STATUS_IC)
|
|
if (value & PORT_STATUS_IC)
|
|
break;
|
|
break;
|
|
- spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
|
|
|
|
|
|
+ spin_unlock_irq(&qdev->hw_lock);
|
|
msleep(500);
|
|
msleep(500);
|
|
- spin_lock_irqsave(&qdev->hw_lock, hw_flags);
|
|
|
|
|
|
+ spin_lock_irq(&qdev->hw_lock);
|
|
} while (--delay);
|
|
} while (--delay);
|
|
|
|
|
|
if (delay == 0) {
|
|
if (delay == 0) {
|