From 57c5cddf7ec9840a492b08e7ffd0cb6d95d786ce Mon Sep 17 00:00:00 2001 From: "shemminger@osdl.org" Date: Mon, 28 Aug 2006 10:00:48 -0700 Subject: [PATCH] --- yaml --- r: 35185 b: refs/heads/master c: bb507fe11ffda19eee158ce0be42d222135b7aca h: refs/heads/master i: 35183: 81163ee9d3c36a6b2102b87958dfc8de89ca6f5b v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 51228b77a3e4..221173ea1bd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97bda706b475655088201d7bb96cb8dd6d0d1aa3 +refs/heads/master: bb507fe11ffda19eee158ce0be42d222135b7aca diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 6cc5696e9a3e..2a2adc23f6ae 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -3189,6 +3189,8 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw) struct pci_dev *pdev = hw->pdev; int err; + init_waitqueue_head (&hw->msi_wait); + sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW); err = request_irq(pdev->irq, sky2_test_intr, IRQF_SHARED, DRV_NAME, hw); @@ -3198,10 +3200,8 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw) return err; } - init_waitqueue_head (&hw->msi_wait); - sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ); - wmb(); + sky2_read8(hw, B0_CTST); wait_event_timeout(hw->msi_wait, hw->msi_detected, HZ/10);