Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8f59586 authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Jeff Garzik
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 043600a6

drivers/net/usb/dm9601.c

+2 −4
Original line number Diff line number Diff line
@@ -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);