Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 02b622e3b9fb..1d93133e9b74 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -599,13 +599,13 @@ static void dm9601_status(struct usbnet *dev, struct urb *urb)
 
 static int dm9601_link_reset(struct usbnet *dev)
 {
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
 
-        netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n",
-                   ecmd.speed, ecmd.duplex);
+        netdev_dbg(dev->net, "link_reset() speed: %u duplex: %d\n",
+                   ethtool_cmd_speed(&ecmd), ecmd.duplex);
 
         return 0;
 }
@@ -651,6 +651,10 @@ static const struct usb_device_id products[] = {
         .driver_info = (unsigned long)&dm9601_info,
          },
         {
+         USB_DEVICE(0x0fe6, 0x9700),    /* DM9601 USB to Fast Ethernet Adapter */
+         .driver_info = (unsigned long)&dm9601_info,
+         },
+        {
          USB_DEVICE(0x0a46, 0x9000),    /* DM9000E */
          .driver_info = (unsigned long)&dm9601_info,
          },