From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 28 Feb 2009 03:49:00 +0000 (-0800)
Subject: Staging: line6: fix bus_id usage
X-Git-Tag: v2.6.30-rc1~202^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4717b03b56fedd1c44fe6a0701cd4e36e97efbab;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index e15fa1f6ee483..f6ad274127973 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;
 }