diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2007-06-30 17:07:42 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-02 08:24:51 -0400 |
commit | b8f59586cecdb612cd31f4d9e7904f46277ddd64 (patch) | |
tree | 0b2ba951170c07133abc8f1c2d2955a44beb0257 /drivers/net/usb | |
parent | 043600a62a45b2d5cac262fca9012fc24db19964 (diff) |
dm9601: Return 0 from bind() on success
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>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/dm9601.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index ac200b0f6a92..16c7a0e87850 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
@@ -414,18 +414,16 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) | |||
414 | dev->mii.reg_num_mask = 0x1f; | 414 | dev->mii.reg_num_mask = 0x1f; |
415 | 415 | ||
416 | /* reset */ | 416 | /* reset */ |
417 | ret = dm_write_reg(dev, DM_NET_CTRL, 1); | 417 | dm_write_reg(dev, DM_NET_CTRL, 1); |
418 | udelay(20); | 418 | udelay(20); |
419 | 419 | ||
420 | /* read MAC */ | 420 | /* read MAC */ |
421 | ret = dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr); | 421 | if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr) < 0) { |
422 | if (ret < 0) { | ||
423 | printk(KERN_ERR "Error reading MAC address\n"); | 422 | printk(KERN_ERR "Error reading MAC address\n"); |
424 | ret = -ENODEV; | 423 | ret = -ENODEV; |
425 | goto out; | 424 | goto out; |
426 | } | 425 | } |
427 | 426 | ||
428 | |||
429 | /* power up phy */ | 427 | /* power up phy */ |
430 | dm_write_reg(dev, DM_GPR_CTRL, 1); | 428 | dm_write_reg(dev, DM_GPR_CTRL, 1); |
431 | dm_write_reg(dev, DM_GPR_DATA, 0); | 429 | dm_write_reg(dev, DM_GPR_DATA, 0); |