diff options
author | Martin Gebert <martin.gebert@alpha-bit.de> | 2008-07-23 03:40:09 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:48:58 -0400 |
commit | 533763d34862101090f8563aa9da202583b2423d (patch) | |
tree | 516d09b5cd590c27f4a15f7740a617265ac143e7 | |
parent | 894d6276ed8dca0365a91b6d4858c37c58b962d7 (diff) |
[netdrvr] au1000_eth: Spinlock initialisation fix
Seems like the spinlock for the AU1x00 ethernet device is initialised too
late, as it is already used in enable_mac(), which is called via
mii_probe() before the init takes place.
The attached patch is working here for a Linux Au1100 2.6.22.6 kernel,
and as far as I checked should also be applicable to the current head
(just line numbers differ).
Signed-off-by: Martin Gebert <Martin.Gebert@alpha-bit.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/net/au1000_eth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 5ee1b0557a02..92c16c37ff23 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -653,6 +653,8 @@ static struct net_device * au1000_probe(int port_num) | |||
653 | 653 | ||
654 | aup = dev->priv; | 654 | aup = dev->priv; |
655 | 655 | ||
656 | spin_lock_init(&aup->lock); | ||
657 | |||
656 | /* Allocate the data buffers */ | 658 | /* Allocate the data buffers */ |
657 | /* Snooping works fine with eth on all au1xxx */ | 659 | /* Snooping works fine with eth on all au1xxx */ |
658 | aup->vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE * | 660 | aup->vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE * |
@@ -753,7 +755,6 @@ static struct net_device * au1000_probe(int port_num) | |||
753 | aup->tx_db_inuse[i] = pDB; | 755 | aup->tx_db_inuse[i] = pDB; |
754 | } | 756 | } |
755 | 757 | ||
756 | spin_lock_init(&aup->lock); | ||
757 | dev->base_addr = base; | 758 | dev->base_addr = base; |
758 | dev->irq = irq; | 759 | dev->irq = irq; |
759 | dev->open = au1000_open; | 760 | dev->open = au1000_open; |