[linux-usb-devel] [PATCH] USB dabusb driver update for 2.2.20-pre2

[Greg KH]

(patch 4 of 8)

Hi,

Here's a patch for the usb dabusb driver against 2.2.20-pre2 that brings
it up to the same logic level that is in 2.4.5.

thanks,

greg k-h

diff -Nru a/drivers/usb/dabusb.c b/drivers/usb/dabusb.c
--- a/drivers/usb/dabusb.c      Tue Jun 12 22:34:40 2001
+++ b/drivers/usb/dabusb.c      Tue Jun 12 22:34:40 2001
@@ -43,6 +43,13 @@
 #include "dabusb.h"
 #include "dabfirmware.h"
 
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "v1.54"
+#define DRIVER_AUTHOR "Deti Fliegl, [EMAIL PROTECTED]"
+#define DRIVER_DESC "DAB-USB Interface Driver for Linux (c)1999"
+
 /* --------------------------------------------------------------------- */
 
 #define NRDABUSB 4
@@ -173,8 +180,8 @@
 
        // process if URB was not killed
        if (purb->status != -ENOENT) {
-               unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE);
-               int pipesize = usb_maxpacket (s->usbdev, pipe, usb_pipeout (pipe));
+               unsigned int pipe = usb_rcvisocpipe (purb->dev, _DABUSB_ISOPIPE);
+               int pipesize = usb_maxpacket (purb->dev, pipe, usb_pipeout (pipe));
                for (i = 0; i < purb->number_of_packets; i++)
                        if (!purb->iso_frame_desc[i].status) {
                                len = purb->iso_frame_desc[i].actual_length;
@@ -456,8 +463,6 @@
 
                        end = list_entry (s->rec_buff_list.prev, buff_t, buff_list);
 
-                       end->purb->dev=s->usbdev;
-
                        ret = usb_submit_urb (end->purb);
                        if (ret) {
                                err("usb_submit_urb returned:%d", ret);
@@ -793,11 +798,11 @@
 
 static struct usb_driver dabusb_driver =
 {
-       "dabusb",
-       dabusb_probe,
-       dabusb_disconnect,
-       {NULL, NULL},
-       &dabusb_fops,
+       name:           "dabusb",
+       probe:          dabusb_probe,
+       disconnect:     dabusb_disconnect,
+       fops:           &dabusb_fops,
+       minor:          DABUSB_MINOR,
        DABUSB_MINOR
 };
 
@@ -826,6 +831,10 @@
                return -1;
 
        dbg("dabusb_init: driver registered");
+
+       info(DRIVER_VERSION " " DRIVER_AUTHOR);
+       info(DRIVER_DESC);
+
        return 0;
 }
 
@@ -838,8 +847,9 @@
 
 /* --------------------------------------------------------------------- */
 
-MODULE_AUTHOR ("Deti Fliegl, [EMAIL PROTECTED]");
-MODULE_DESCRIPTION ("DAB-USB Interface Driver for Linux (c)1999");
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );
+
 MODULE_PARM (buffers, "i");
 MODULE_PARM_DESC (buffers, "Number of buffers (default=256)");
 
diff -Nru a/drivers/usb/dabusb.h b/drivers/usb/dabusb.h
--- a/drivers/usb/dabusb.h      Tue Jun 12 22:34:40 2001
+++ b/drivers/usb/dabusb.h      Tue Jun 12 22:34:40 2001
@@ -23,7 +23,7 @@
        wait_queue_head_t wait;
        wait_queue_head_t remove_ok;
        spinlock_t lock;
-       volatile atomic_t pending_io;
+       atomic_t pending_io;
        driver_state_t state;
        int remove_pending;
        int got_mem;