diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-19 16:29:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-19 16:29:40 -0700 |
| commit | 44dc19c829c057dc78a5ffacaf851ac4c301eb58 (patch) | |
| tree | 7da34731e9dfaefaf14f9119158db864b7677a12 /drivers/net/wireless/airo.c | |
| parent | 0686caa35ed17cf5b9043f453957e702a7eb588d (diff) | |
| parent | 229ce3abb6d6d4598de8ef1ed1e2da8163a9bbc0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 45f47c1c0a3..4e1c690ff45 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(struct airo_info *ai, dev->irq = ethdev->irq; dev->base_addr = ethdev->base_addr; dev->wireless_data = ethdev->wireless_data; + SET_NETDEV_DEV(dev, ethdev->dev.parent); memcpy(dev->dev_addr, ethdev->dev_addr, dev->addr_len); err = register_netdev(dev); if (err<0) { @@ -2904,7 +2905,7 @@ EXPORT_SYMBOL(init_airo_card); static int waitbusy (struct airo_info *ai) { int delay = 0; - while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) & (delay < 10000)) { + while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) { udelay (10); if ((++delay % 20) == 0) OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); |