]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Staging: line6: fix bus_id usage
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 28 Feb 2009 03:49:00 +0000 (19:49 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Apr 2009 21:54:24 +0000 (14:54 -0700)
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>
drivers/staging/line6/audio.c

index e15fa1f6ee4834b92cad8be7405c6763eaaab6e4..f6ad27412797327dcf08c28fa4d1b9926f8098d7 100644 (file)
@@ -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;
 }