diff options
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 1f05511fa390..8243150f5b05 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -194,9 +194,9 @@ static void enqueue(struct list_head *node, struct list_head *lh) | |||
| 194 | { | 194 | { |
| 195 | unsigned long flags; | 195 | unsigned long flags; |
| 196 | 196 | ||
| 197 | spin_lock_irqsave(ugeth_lock, flags); | 197 | spin_lock_irqsave(&ugeth_lock, flags); |
| 198 | list_add_tail(node, lh); | 198 | list_add_tail(node, lh); |
| 199 | spin_unlock_irqrestore(ugeth_lock, flags); | 199 | spin_unlock_irqrestore(&ugeth_lock, flags); |
| 200 | } | 200 | } |
| 201 | #endif /* CONFIG_UGETH_FILTERING */ | 201 | #endif /* CONFIG_UGETH_FILTERING */ |
| 202 | 202 | ||
| @@ -204,14 +204,14 @@ static struct list_head *dequeue(struct list_head *lh) | |||
| 204 | { | 204 | { |
| 205 | unsigned long flags; | 205 | unsigned long flags; |
| 206 | 206 | ||
| 207 | spin_lock_irqsave(ugeth_lock, flags); | 207 | spin_lock_irqsave(&ugeth_lock, flags); |
| 208 | if (!list_empty(lh)) { | 208 | if (!list_empty(lh)) { |
| 209 | struct list_head *node = lh->next; | 209 | struct list_head *node = lh->next; |
| 210 | list_del(node); | 210 | list_del(node); |
| 211 | spin_unlock_irqrestore(ugeth_lock, flags); | 211 | spin_unlock_irqrestore(&ugeth_lock, flags); |
| 212 | return node; | 212 | return node; |
| 213 | } else { | 213 | } else { |
| 214 | spin_unlock_irqrestore(ugeth_lock, flags); | 214 | spin_unlock_irqrestore(&ugeth_lock, flags); |
| 215 | return NULL; | 215 | return NULL; |
| 216 | } | 216 | } |
| 217 | } | 217 | } |
| @@ -1852,6 +1852,8 @@ static int init_phy(struct net_device *dev) | |||
| 1852 | mii_info->mdio_read = &read_phy_reg; | 1852 | mii_info->mdio_read = &read_phy_reg; |
| 1853 | mii_info->mdio_write = &write_phy_reg; | 1853 | mii_info->mdio_write = &write_phy_reg; |
| 1854 | 1854 | ||
| 1855 | spin_lock_init(&mii_info->mdio_lock); | ||
| 1856 | |||
| 1855 | ugeth->mii_info = mii_info; | 1857 | ugeth->mii_info = mii_info; |
| 1856 | 1858 | ||
| 1857 | spin_lock_irq(&ugeth->lock); | 1859 | spin_lock_irq(&ugeth->lock); |
