diff --git a/[refs] b/[refs] index 1c7a10500605..ef58bee2cf3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 705ececd1c60d0f5d6ef2a719008847883516970 +refs/heads/master: 4717b03b56fedd1c44fe6a0701cd4e36e97efbab diff --git a/trunk/drivers/staging/line6/audio.c b/trunk/drivers/staging/line6/audio.c index e15fa1f6ee48..f6ad27412797 100644 --- a/trunk/drivers/staging/line6/audio.c +++ b/trunk/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; }