diff options
Diffstat (limited to 'drivers/net/atl1/atl1_main.c')
-rw-r--r-- | drivers/net/atl1/atl1_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c index 3bb40dd4a410..ef12dba85811 100644 --- a/drivers/net/atl1/atl1_main.c +++ b/drivers/net/atl1/atl1_main.c | |||
@@ -162,7 +162,6 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter) | |||
162 | hw->cmb_tx_timer = 1; /* about 2us */ | 162 | hw->cmb_tx_timer = 1; /* about 2us */ |
163 | hw->smb_timer = 100000; /* about 200ms */ | 163 | hw->smb_timer = 100000; /* about 200ms */ |
164 | 164 | ||
165 | atomic_set(&adapter->irq_sem, 0); | ||
166 | spin_lock_init(&adapter->lock); | 165 | spin_lock_init(&adapter->lock); |
167 | spin_lock_init(&adapter->mb_lock); | 166 | spin_lock_init(&adapter->mb_lock); |
168 | 167 | ||
@@ -268,8 +267,8 @@ err_nomem: | |||
268 | */ | 267 | */ |
269 | static void atl1_irq_enable(struct atl1_adapter *adapter) | 268 | static void atl1_irq_enable(struct atl1_adapter *adapter) |
270 | { | 269 | { |
271 | if (likely(!atomic_dec_and_test(&adapter->irq_sem))) | 270 | iowrite32(IMR_NORMAL_MASK, adapter->hw.hw_addr + REG_IMR); |
272 | iowrite32(IMR_NORMAL_MASK, adapter->hw.hw_addr + REG_IMR); | 271 | ioread32(adapter->hw.hw_addr + REG_IMR); |
273 | } | 272 | } |
274 | 273 | ||
275 | static void atl1_clear_phy_int(struct atl1_adapter *adapter) | 274 | static void atl1_clear_phy_int(struct atl1_adapter *adapter) |
@@ -1195,7 +1194,6 @@ static u32 atl1_configure(struct atl1_adapter *adapter) | |||
1195 | */ | 1194 | */ |
1196 | static void atl1_irq_disable(struct atl1_adapter *adapter) | 1195 | static void atl1_irq_disable(struct atl1_adapter *adapter) |
1197 | { | 1196 | { |
1198 | atomic_inc(&adapter->irq_sem); | ||
1199 | iowrite32(0, adapter->hw.hw_addr + REG_IMR); | 1197 | iowrite32(0, adapter->hw.hw_addr + REG_IMR); |
1200 | ioread32(adapter->hw.hw_addr + REG_IMR); | 1198 | ioread32(adapter->hw.hw_addr + REG_IMR); |
1201 | synchronize_irq(adapter->pdev->irq); | 1199 | synchronize_irq(adapter->pdev->irq); |