1 files changed, 27 insertions, 9 deletions

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 120e99914fd6..d6a71c051ec1 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -74,6 +74,8 @@
 #define LAN7801_USB_PRODUCT_ID          (0x7801)
 #define LAN78XX_EEPROM_MAGIC            (0x78A5)
 #define LAN78XX_OTP_MAGIC               (0x78F3)
+#define AT29M2AF_USB_VENDOR_ID          (0x07C9)
+#define AT29M2AF_USB_PRODUCT_ID (0x0012)
 
 #define MII_READ                        1
 #define MII_WRITE                       0
@@ -920,11 +922,9 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset,
         ret = lan78xx_read_raw_otp(dev, 0, 1, &sig);
 
         if (ret == 0) {
-                if (sig == OTP_INDICATOR_1)
-                        offset = offset;
-                else if (sig == OTP_INDICATOR_2)
+                if (sig == OTP_INDICATOR_2)
                         offset += 0x100;
-                else
+                else if (sig != OTP_INDICATOR_1)
                         ret = -EINVAL;
                 if (!ret)
                         ret = lan78xx_read_raw_otp(dev, offset, length, data);
@@ -1147,7 +1147,7 @@ static int lan78xx_link_reset(struct lan78xx_net *dev)
 {
         struct phy_device *phydev = dev->net->phydev;
         struct ethtool_link_ksettings ecmd;
-        int ladv, radv, ret;
+        int ladv, radv, ret, link;
         u32 buf;
 
         /* clear LAN78xx interrupt status */
@@ -1155,9 +1155,12 @@ static int lan78xx_link_reset(struct lan78xx_net *dev)
         if (unlikely(ret < 0))
                 return -EIO;
 
+        mutex_lock(&phydev->lock);
         phy_read_status(phydev);
+        link = phydev->link;
+        mutex_unlock(&phydev->lock);
 
-        if (!phydev->link && dev->link_on) {
+        if (!link && dev->link_on) {
                 dev->link_on = false;
 
                 /* reset MAC */
@@ -1170,7 +1173,7 @@ static int lan78xx_link_reset(struct lan78xx_net *dev)
                         return -EIO;
 
                 del_timer(&dev->stat_monitor);
-        } else if (phydev->link && !dev->link_on) {
+        } else if (link && !dev->link_on) {
                 dev->link_on = true;
 
                 phy_ethtool_ksettings_get(phydev, &ecmd);
@@ -1457,9 +1460,14 @@ static int lan78xx_set_eee(struct net_device *net, struct ethtool_eee *edata)
 
 static u32 lan78xx_get_link(struct net_device *net)
 {
+        u32 link;
+
+        mutex_lock(&net->phydev->lock);
         phy_read_status(net->phydev);
+        link = net->phydev->link;
+        mutex_unlock(&net->phydev->lock);
 
-        return net->phydev->link;
+        return link;
 }
 
 static void lan78xx_get_drvinfo(struct net_device *net,
@@ -2044,7 +2052,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
         if (dev->domain_data.phyirq > 0)
                 phydev->irq = dev->domain_data.phyirq;
         else
-                phydev->irq = 0;
+                phydev->irq = PHY_POLL;
         netdev_dbg(dev->net, "phydev->irq = %d\n", phydev->irq);
 
         /* set to AUTOMDIX */
@@ -3607,6 +3615,12 @@ static int lan78xx_probe(struct usb_interface *intf,
 
         dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out, 1);
 
+        /* Reject broken descriptors. */
+        if (dev->maxpacket == 0) {
+                ret = -ENODEV;
+                goto out4;
+        }
+
         /* driver requires remote-wakeup capability during autosuspend. */
         intf->needs_remote_wakeup = 1;
 
@@ -4001,6 +4015,10 @@ static const struct usb_device_id products[] = {
         /* LAN7801 USB Gigabit Ethernet Device */
         USB_DEVICE(LAN78XX_USB_VENDOR_ID, LAN7801_USB_PRODUCT_ID),
         },
+        {
+        /* ATM2-AF USB Gigabit Ethernet Device */
+        USB_DEVICE(AT29M2AF_USB_VENDOR_ID, AT29M2AF_USB_PRODUCT_ID),
+        },
         {},
 };
 MODULE_DEVICE_TABLE(usb, products);