Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / line6 / audio.c

diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index e2ac8d60f8c27195441bf04f5e0d8afb6917e8f0..61db1f99b0c8ffe5c62eae7b8ad505da141de5df 100644 (file)
--- a/drivers/staging/line6/audio.c
+++ b/drivers/staging/line6/audio.c
@@ -1,7 +1,7 @@
 /*
- * Line6 Linux USB driver - 0.8.0
+ * Line6 Linux USB driver - 0.9.1beta
  *
- * Copyright (C) 2004-2009 Markus Grabner (grabner@icg.tugraz.at)
+ * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License as
@@ -9,17 +9,15 @@
  *
  */
 
-#include "driver.h"
-#include "audio.h"
-
 #include <sound/core.h>
 #include <sound/initval.h>
 
+#include "driver.h"
+#include "audio.h"
 
 static int line6_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *line6_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
 
-
 /*
        Initialize the Line6 USB audio system.
 */
@@ -36,10 +34,12 @@ int line6_init_audio(struct usb_line6 *line6)
 
        line6->card = card;
 
+       strcpy(card->id, line6->properties->id);
        strcpy(card->driver, DRIVER_NAME);
-       strcpy(card->shortname, "Line6-USB");
+       strcpy(card->shortname, line6->properties->name);
+       /* longname is 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 */
+               dev_name(line6->ifcdev));
        return 0;
 }