Skip to content

Commit

Permalink
dm9601: Return 0 from bind() on success
Browse files Browse the repository at this point in the history
Fixup dm9601_bind() so it returns 0 on success rather than just a positive
number, as otherwise usbnet doesn't init the status handler.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Peter Korsgaard authored and Jeff Garzik committed Jul 2, 2007
1 parent 043600a commit b8f5958
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/usb/dm9601.c
Original file line number Diff line number Diff line change
Expand Up @@ -414,18 +414,16 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
dev->mii.reg_num_mask = 0x1f;

/* reset */
ret = dm_write_reg(dev, DM_NET_CTRL, 1);
dm_write_reg(dev, DM_NET_CTRL, 1);
udelay(20);

/* read MAC */
ret = dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr);
if (ret < 0) {
if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr) < 0) {
printk(KERN_ERR "Error reading MAC address\n");
ret = -ENODEV;
goto out;
}


/* power up phy */
dm_write_reg(dev, DM_GPR_CTRL, 1);
dm_write_reg(dev, DM_GPR_DATA, 0);
Expand Down

0 comments on commit b8f5958

Please sign in to comment.