aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-02-27 19:49:00 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:24 -0700
commit4717b03b56fedd1c44fe6a0701cd4e36e97efbab (patch)
treea118ffda9f43da3b5f6de19537d98f515853e34c
parent705ececd1c60d0f5d6ef2a719008847883516970 (diff)
downloadkernel_samsung_espresso10-4717b03b56fedd1c44fe6a0701cd4e36e97efbab.zip
kernel_samsung_espresso10-4717b03b56fedd1c44fe6a0701cd4e36e97efbab.tar.gz
kernel_samsung_espresso10-4717b03b56fedd1c44fe6a0701cd4e36e97efbab.tar.bz2
Staging: line6: fix bus_id usage
bus_id is now gone in the linux-next tree, so replace it with dev_name() so the code works properly. Cc: Markus Grabner <grabner@icg.tugraz.at> Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/line6/audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index e15fa1f..f6ad274 100644
--- a/drivers/staging/line6/audio.c
+++ b/drivers/staging/line6/audio.c
@@ -36,7 +36,8 @@ int line6_init_audio(struct usb_line6 *line6)
strcpy(card->driver, DRIVER_NAME);
strcpy(card->shortname, "Line6-USB");
- sprintf(card->longname, "Line6 %s at USB %s", line6->properties->name, line6->ifcdev->bus_id); /* 80 chars - see asound.h */
+ sprintf(card->longname, "Line6 %s at USB %s", line6->properties->name,
+ dev_name(line6->ifcdev)); /* 80 chars - see asound.h */
return 0;
}