Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

2 files changed, 8 insertions, 13 deletions

diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c
index fd7cbf5aa895..3ebc8cbc91ff 100644
--- a/net/caif/caif_usb.c
+++ b/net/caif/caif_usb.c
@@ -126,20 +126,16 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
         struct net_device *dev = arg;
         struct caif_dev_common common;
         struct cflayer *layer, *link_support;
-        struct usbnet   *usbnet = netdev_priv(dev);
-        struct usb_device       *usbdev = usbnet->udev;
-        struct ethtool_drvinfo drvinfo;
+        struct usbnet *usbnet;
+        struct usb_device *usbdev;
 
-        /*
-         * Quirks: High-jack ethtool to find if we have a NCM device,
-         * and find it's VID/PID.
-         */
-        if (dev->ethtool_ops == NULL || dev->ethtool_ops->get_drvinfo == NULL)
+        /* Check whether we have a NCM device, and find its VID/PID. */
+        if (!(dev->dev.parent && dev->dev.parent->driver &&
+              strcmp(dev->dev.parent->driver->name, "cdc_ncm") == 0))
                 return 0;
 
-        dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
-        if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0)
-                return 0;
+        usbnet = netdev_priv(dev);
+        usbdev = usbnet->udev;
 
         pr_debug("USB CDC NCM device VID:0x%4x PID:0x%4x\n",
                 le16_to_cpu(usbdev->descriptor.idVendor),
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index 44f270fc2d06..a376ec1ac0a7 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -515,8 +515,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)
                                                           client_layer : NULL);
                         }
 
-                        if (req != NULL)
-                                kfree(req);
+                        kfree(req);
 
                         spin_unlock_bh(&cfctrl->info_list_lock);
                 }