diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
| commit | ba4ccd8831a8174e533cb02d03134a512e4ea79b (patch) | |
| tree | b3be2e92ab11ef568ff5ccba47989e6d5950222c /drivers/staging/agnx/pci.c | |
| parent | c23553f91afc3d030b45bfbf637a08698558ff9b (diff) | |
| parent | a6ab2b64c43054920f41332ab12e853997d467cf (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/agnx/pci.c')
| -rw-r--r-- | drivers/staging/agnx/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c index 1fe987065257..32b5489456a8 100644 --- a/drivers/staging/agnx/pci.c +++ b/drivers/staging/agnx/pci.c @@ -280,7 +280,7 @@ static void agnx_stop(struct ieee80211_hw *dev) /* make sure hardware will not generate irq */ agnx_hw_reset(priv); free_irq(priv->pdev->irq, dev); - flush_workqueue(priv->hw->workqueue); +/* flush_workqueue(priv->hw->workqueue); */ /* cancel_delayed_work_sync(&priv->periodic_work); */ unfill_rings(priv); rings_free(priv); |