diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-16 16:27:51 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-16 16:27:51 +1100 |
commit | c8a4847b01a1270b7c2a69014b7f4fb3947cb482 (patch) | |
tree | 43c130f511f767528f2751228baf75a55d9e1da1 /drivers/staging/agnx | |
parent | 27321dbdb493ba24435d3614c37ed752ec404ff0 (diff) | |
parent | 9038489cf4e58b5033482ee9e07165c384ced465 (diff) |
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/agnx')
-rw-r--r-- | drivers/staging/agnx/pci.c | 3 | ||||
-rw-r--r-- | drivers/staging/agnx/rf.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c index 854630cb527e..131df9f6c68d 100644 --- a/drivers/staging/agnx/pci.c +++ b/drivers/staging/agnx/pci.c @@ -434,11 +434,12 @@ static struct ieee80211_ops agnx_ops = { static void __devexit agnx_pci_remove(struct pci_dev *pdev) { struct ieee80211_hw *dev = pci_get_drvdata(pdev); - struct agnx_priv *priv = dev->priv; + struct agnx_priv *priv; AGNX_TRACE; if (!dev) return; + priv = dev->priv; ieee80211_unregister_hw(dev); pci_iounmap(pdev, priv->ctl); pci_iounmap(pdev, priv->data); diff --git a/drivers/staging/agnx/rf.c b/drivers/staging/agnx/rf.c index 8294b6e2eb9d..9e1e9d5ccf9b 100644 --- a/drivers/staging/agnx/rf.c +++ b/drivers/staging/agnx/rf.c @@ -669,7 +669,7 @@ static inline void calibra_delay(struct agnx_priv *priv) unsigned int i = 100; wmb(); - while (i--) { + while (--i) { reg = (ioread32(ctl + AGNX_ACI_STATUS)); if (reg == 0x4000) break; |