From: Bjørn Mork <bjorn@mork.no>
Date: Fri, 20 Jan 2012 03:17:25 +0000 (+0100)
Subject: USB: cdc-wdm: avoid printing odd-looking "cdc-wdm-176" names
X-Git-Tag: MMI-PSA29.97-13-9~17266^2~22^2~121^2~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=820c629a595ad8d8f2694641e494738b18d29e7b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

USB: cdc-wdm: avoid printing odd-looking "cdc-wdm-176" names

usb_register_dev() will change our .minor_base to 0 if
CONFIG_USB_DYNAMIC_MINORS is set.  And it usually is, of
course.

Use dev_name() to print the proper interface name instead

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index c0197af22fd8..c154d4f1d674 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -723,8 +723,7 @@ next_desc:
 	if (rv < 0)
 		goto err2;
 	else
-		dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n",
-			intf->minor - WDM_MINOR_BASE);
+		dev_info(&intf->dev, "%s: USB WDM device\n", dev_name(intf->usb_dev));
 out:
 	return rv;
 err2: