From 5344680d91af5605fdd34c1dde5c5e4db1cc4fc0 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 7 Dec 2012 06:20:27 +0000
Subject: [PATCH] --- yaml --- r: 342056 b: refs/heads/master c:
 65d2897c0f1b240420d657f41e561239fa10ba94 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/caif/caif_usb.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index ba9d0938fccf..9303462fe963 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 406636340c301b46062b22f94e3815ef767bd6a3
+refs/heads/master: 65d2897c0f1b240420d657f41e561239fa10ba94
diff --git a/trunk/net/caif/caif_usb.c b/trunk/net/caif/caif_usb.c
index 582f80c8ef3d..3ebc8cbc91ff 100644
--- a/trunk/net/caif/caif_usb.c
+++ b/trunk/net/caif/caif_usb.c
@@ -128,17 +128,10 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
 	struct cflayer *layer, *link_support;
 	struct usbnet *usbnet;
 	struct usb_device *usbdev;
-	struct ethtool_drvinfo drvinfo;
 
-	/*
-	 * 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)
-		return 0;
-
-	dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
-	if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0)
+	/* 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;
 
 	usbnet = netdev_priv(dev);