aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-01-20 04:17:25 +0100
committerBjørn Mork <bjorn@mork.no>2012-06-04 21:57:55 +0200
commited3c39436f87e90e748171e19c7deabdf380f0c0 (patch)
tree08faa98d5ae11402ebce902a6039738a5241bfe0
parentf53d7680f3dc570a34ad99138272711ce44eba98 (diff)
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> (cherry picked from commit 820c629a595ad8d8f2694641e494738b18d29e7b) Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--drivers/usb/class/cdc-wdm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index ebe369324f9..d7bf8dea42a 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -752,8 +752,7 @@ next_desc:
if (rv < 0)
goto err3;
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;
err3: