Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96599
b: refs/heads/master
c: 37d5dca
h: refs/heads/master
i:
  96597: 1e016c3
  96595: 0e8e450
  96591: faeb03e
v: v3
  • Loading branch information
Enrico Scholz authored and Jeff Garzik committed May 13, 2008
1 parent 3db908b commit 6e3f10e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e21fd4f07dd0c2630c3db41f419e4c658d0dee2c
refs/heads/master: 37d5dca6af6b62bbb2c63f46a06cb07d0cf4522b
5 changes: 4 additions & 1 deletion trunk/drivers/net/dm9000.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ dm9000_probe(struct platform_device *pdev)

SET_NETDEV_DEV(ndev, &pdev->dev);

dev_dbg(&pdev->dev, "dm9000_probe()");
dev_dbg(&pdev->dev, "dm9000_probe()\n");

/* setup board info structure */
db = (struct board_info *) ndev->priv;
Expand Down Expand Up @@ -1288,6 +1288,8 @@ dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg)
spin_unlock_irqrestore(&db->lock,flags);

mutex_unlock(&db->addr_lock);

dm9000_dbg(db, 5, "phy_read[%02x] -> %04x\n", reg, ret);
return ret;
}

Expand All @@ -1301,6 +1303,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
unsigned long flags;
unsigned long reg_save;

dm9000_dbg(db, 5, "phy_write[%02x] = %04x\n", reg, value);
mutex_lock(&db->addr_lock);

spin_lock_irqsave(&db->lock,flags);
Expand Down

0 comments on commit 6e3f10e

Please sign in to comment.