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

Commit 687740ce authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'lan78xx-fixes' 



Nisar Sayed says:

====================
lan78xx: This series of patches are for lan78xx driver.

This series of patches are for lan78xx driver.

These patches fixes potential issues associated with lan78xx driver.

v5
- Updated changes as per comments

v4
- Updated changes to handle return values as per comments
- Updated EEPROM write handling as per comments

v3
- Updated chagnes as per comments

v2
- Added patch version information
- Added fixes tag
- Updated patch description
- Updated chagnes as per comments

v1
- Splitted patches as per comments
- Dropped "fixed_phy device support" and "Fix for system suspend" changes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 59ec693a e3652805

drivers/net/usb/lan78xx.c

+24 −10
Original line number Diff line number Diff line
@@ -1265,30 +1265,45 @@ static int lan78xx_ethtool_get_eeprom(struct net_device *netdev, 
				      struct ethtool_eeprom *ee, u8 *data)

{

	struct lan78xx_net *dev = netdev_priv(netdev);

	int ret;



	ret = usb_autopm_get_interface(dev->intf);

	if (ret)

		return ret;



	ee->magic = LAN78XX_EEPROM_MAGIC;



	return lan78xx_read_raw_eeprom(dev, ee->offset, ee->len, data);

	ret = lan78xx_read_raw_eeprom(dev, ee->offset, ee->len, data);



	usb_autopm_put_interface(dev->intf);



	return ret;

}



static int lan78xx_ethtool_set_eeprom(struct net_device *netdev,

				      struct ethtool_eeprom *ee, u8 *data)

{

	struct lan78xx_net *dev = netdev_priv(netdev);

	int ret;



	/* Allow entire eeprom update only */

	if ((ee->magic == LAN78XX_EEPROM_MAGIC) &&

	    (ee->offset == 0) &&

	    (ee->len == 512) &&

	    (data[0] == EEPROM_INDICATOR))

		return lan78xx_write_raw_eeprom(dev, ee->offset, ee->len, data);

	ret = usb_autopm_get_interface(dev->intf);

	if (ret)

		return ret;



	/* Invalid EEPROM_INDICATOR at offset zero will result in a failure

	 * to load data from EEPROM

	 */

	if (ee->magic == LAN78XX_EEPROM_MAGIC)

		ret = lan78xx_write_raw_eeprom(dev, ee->offset, ee->len, data);

	else if ((ee->magic == LAN78XX_OTP_MAGIC) &&

		 (ee->offset == 0) &&

		 (ee->len == 512) &&

		 (data[0] == OTP_INDICATOR_1))

		return lan78xx_write_raw_otp(dev, ee->offset, ee->len, data);

		ret = lan78xx_write_raw_otp(dev, ee->offset, ee->len, data);



	return -EINVAL;

	usb_autopm_put_interface(dev->intf);



	return ret;

}



static void lan78xx_get_strings(struct net_device *netdev, u32 stringset,
@@ -2434,7 +2449,6 @@ static int lan78xx_reset(struct lan78xx_net *dev) 
	/* LAN7801 only has RGMII mode */

	if (dev->chipid == ID_REV_CHIP_ID_7801_)

		buf &= ~MAC_CR_GMII_EN_;

	buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;

	ret = lan78xx_write_reg(dev, MAC_CR, buf);



	ret = lan78xx_read_reg(dev, MAC_TX, &buf);