diff options
Diffstat (limited to 'drivers/net/ethernet/qlogic/qla3xxx.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qla3xxx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 7931531c3a40..e61560e16385 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c | |||
| @@ -3017,7 +3017,6 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) | |||
| 3017 | (void __iomem *)port_regs; | 3017 | (void __iomem *)port_regs; |
| 3018 | u32 delay = 10; | 3018 | u32 delay = 10; |
| 3019 | int status = 0; | 3019 | int status = 0; |
| 3020 | unsigned long hw_flags = 0; | ||
| 3021 | 3020 | ||
| 3022 | if (ql_mii_setup(qdev)) | 3021 | if (ql_mii_setup(qdev)) |
| 3023 | return -1; | 3022 | return -1; |
| @@ -3228,9 +3227,9 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) | |||
| 3228 | value = ql_read_page0_reg(qdev, &port_regs->portStatus); | 3227 | value = ql_read_page0_reg(qdev, &port_regs->portStatus); |
| 3229 | if (value & PORT_STATUS_IC) | 3228 | if (value & PORT_STATUS_IC) |
| 3230 | break; | 3229 | break; |
| 3231 | spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); | 3230 | spin_unlock_irq(&qdev->hw_lock); |
| 3232 | msleep(500); | 3231 | msleep(500); |
| 3233 | spin_lock_irqsave(&qdev->hw_lock, hw_flags); | 3232 | spin_lock_irq(&qdev->hw_lock); |
| 3234 | } while (--delay); | 3233 | } while (--delay); |
| 3235 | 3234 | ||
| 3236 | if (delay == 0) { | 3235 | if (delay == 0) { |
