summaryrefslogtreecommitdiff
path: root/sound/usb/line6/driver.c
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2015-02-07 16:43:19 (GMT)
committerTakashi Iwai <tiwai@suse.de>2015-02-08 08:07:07 (GMT)
commit12865cac38cc9e808ce8b479f4bb12fd00bfee7c (patch)
tree11aaa0bf5e70f2ea7d47fe4f6094033999305d03 /sound/usb/line6/driver.c
parentf2bd242fa114df07ab8ed0d2f445a9a313e3aaa1 (diff)
downloadlinux-12865cac38cc9e808ce8b479f4bb12fd00bfee7c.tar.xz
ALSA: line6: Pass driver name to line6_probe()
Provide a unique name for each driver instead of using "line6usb" for all of them. This will allow for different configurations based on the driver type. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6/driver.c')
-rw-r--r--sound/usb/line6/driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index e2a2603..626b0c3 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -480,6 +480,7 @@ static int line6_init_cap_control(struct usb_line6 *line6)
*/
int line6_probe(struct usb_interface *interface,
const struct usb_device_id *id,
+ const char *driver_name,
const struct line6_properties *properties,
int (*private_init)(struct usb_line6 *, const struct usb_device_id *id),
size_t data_size)
@@ -511,7 +512,7 @@ int line6_probe(struct usb_interface *interface,
line6->ifcdev = &interface->dev;
strcpy(card->id, properties->id);
- strcpy(card->driver, DRIVER_NAME);
+ strcpy(card->driver, driver_name);
strcpy(card->shortname, properties->name);
sprintf(card->longname, "Line 6 %s at USB %s", properties->name,
dev_name(line6->ifcdev));