This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / usb / usx2y / usbusx2y.c

diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 82ecbf6..44a7381 100644 (file)
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -1,10 +1,6 @@
 /*
  * usbus428.c - ALSA USB US-428 Driver
  *
-2004-09-20 Karsten Wiese
-       Version 0.7.3:
-       Use usb_kill_urb() instead of deprecated (kernel 2.6.9) usb_unlink_urb().
-
 2004-07-13 Karsten Wiese
        Version 0.7.1:
        Don't sleep in START/STOP callbacks anymore.
@@ -119,19 +115,20 @@
 
 
 MODULE_AUTHOR("Karsten Wiese <annabellesgarden@yahoo.de>");
-MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.7.3");
+MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.7.2");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001)(0x8005)(0x8007) }}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
+static int boot_devs;
 
-module_param_array(index, int, NULL, 0444);
+module_param_array(index, int, boot_devs, 0444);
 MODULE_PARM_DESC(index, "Index value for "NAME_ALLCAPS".");
-module_param_array(id, charp, NULL, 0444);
+module_param_array(id, charp, boot_devs, 0444);
 MODULE_PARM_DESC(id, "ID string for "NAME_ALLCAPS".");
-module_param_array(enable, bool, NULL, 0444);
+module_param_array(enable, bool, boot_devs, 0444);
 MODULE_PARM_DESC(enable, "Enable "NAME_ALLCAPS".");
 
 
@@ -280,7 +277,7 @@ static void usX2Y_unlinkSeq(snd_usX2Y_AsyncSeq_t* S)
        int     i;
        for (i = 0; i < URBS_AsyncSeq; ++i) {
                if (S[i].urb) {
-                       usb_kill_urb(S->urb[i]);
+                       usb_unlink_urb(S->urb[i]);
                        usb_free_urb(S->urb[i]);
                        S->urb[i] = NULL;
                }
@@ -411,7 +408,7 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr)
                usX2Y->chip.shutdown = 1;
                usX2Y->chip_status = USX2Y_STAT_CHIP_HUP;
                usX2Y_unlinkSeq(&usX2Y->AS04);
-               usb_kill_urb(usX2Y->In04urb);
+               usb_unlink_urb(usX2Y->In04urb);
                snd_card_disconnect((snd_card_t*)ptr);
                /* release the midi resources */
                list_for_each(p, &usX2Y->chip.midi_list) {