Merge branch 'smsc95xx-fix-smsc95xx_bind' (2294ca7a) · Commits · 戴 / test

Andre Edich says: ==================== smsc95xx: fix smsc95xx_bind The patchset fixes two problems in the function smsc95xx_bind: - return of false success - memory leak Changes in v2: - added "Fixes" tags to both patches ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/usb/smsc95xx.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -1287,11 +1287,14 @@ static int smsc95xx_bind(struct usbnet dev, struct usb_interface intf)

		/* Init all registers */
		ret = smsc95xx_reset(dev);
		if (ret)
		goto free_pdata;

		/* detect device revision as different features may be available */
		ret = smsc95xx_read_reg(dev, ID_REV, &val);
		if (ret < 0)
		return ret;
		goto free_pdata;

		val >>= 16;
		pdata->chip_id = val;
		pdata->mdix_ctrl = get_mdix_status(dev->net);
		@@ -1317,6 +1320,10 @@ static int smsc95xx_bind(struct usbnet dev, struct usb_interface intf)
		schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY);

		return 0;

		free_pdata:
		kfree(pdata);
		return ret;
		}

		static void smsc95xx_unbind(struct usbnet dev, struct usb_interface intf)

Admin message