diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-12-29 12:06:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-12-29 12:06:06 +0100 |
| commit | 7b1717fd47d6113f0cf28e82f7d0dc80e0b05621 (patch) | |
| tree | e87f5757d99ade0e3674f4f50bd9fef4cce98615 /drivers/net/usb/lan78xx.c | |
| parent | 342cab29518f544fafe2d0a2a60398bdbda888b1 (diff) | |
| parent | 76d42990efb4902de293be254f5e93c693058c8f (diff) | |
Merge 4.4.297 into android-4.4-p
Changes in 4.4.297
net: usb: lan78xx: add Allied Telesis AT29M2-AF
can: kvaser_usb: get CAN clock frequency from device
HID: holtek: fix mouse probing
IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()
qlcnic: potential dereference null pointer of rx_queue->page_ring
bonding: fix ad_actor_system option setting to default
drivers: net: smc911x: Check for error irq
hwmon: (lm90) Fix usage of CONFIG2 register in detect function
ALSA: jack: Check the return value of kstrdup()
ALSA: drivers: opl3: Fix incorrect use of vp->state
ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
xen/blkfront: fix bug in backported patch
ax25: NPD bug when detaching AX25 device
hamradio: defer ax25 kfree after unregister_netdev
hamradio: improve the incomplete fix to avoid NPD
phonet/pep: refuse to enable an unbound pipe
Linux 4.4.297
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia0deae00fbc04da8f303ac61ade61ccb584542e2
Diffstat (limited to 'drivers/net/usb/lan78xx.c')
| -rw-r--r-- | drivers/net/usb/lan78xx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index ca3c7a4402a1..08c5c68057da 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -66,6 +66,8 @@ #define LAN7850_USB_PRODUCT_ID (0x7850) #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 @@ -3334,6 +3336,10 @@ static const struct usb_device_id products[] = { /* LAN7850 USB Gigabit Ethernet Device */ USB_DEVICE(LAN78XX_USB_VENDOR_ID, LAN7850_USB_PRODUCT_ID), }, + { + /* ATM2-AF USB Gigabit Ethernet Device */ + USB_DEVICE(AT29M2AF_USB_VENDOR_ID, AT29M2AF_USB_PRODUCT_ID), + }, {}, }; MODULE_DEVICE_TABLE(usb, products); |