diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/net/b44.c | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 3fe8ba992c38..f1bd45e3da31 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -1285,6 +1285,9 @@ static int b44_open(struct net_device *dev) | |||
| 1285 | b44_init_hw(bp); | 1285 | b44_init_hw(bp); |
| 1286 | bp->flags |= B44_FLAG_INIT_COMPLETE; | 1286 | bp->flags |= B44_FLAG_INIT_COMPLETE; |
| 1287 | 1287 | ||
| 1288 | netif_carrier_off(dev); | ||
| 1289 | b44_check_phy(bp); | ||
| 1290 | |||
| 1288 | spin_unlock_irq(&bp->lock); | 1291 | spin_unlock_irq(&bp->lock); |
| 1289 | 1292 | ||
| 1290 | init_timer(&bp->timer); | 1293 | init_timer(&bp->timer); |