vserver 1.9.5.x5

[linux-2.6.git] / drivers / media / dvb / b2c2 / b2c2-usb-core.c

diff --git a/drivers/media/dvb/b2c2/b2c2-usb-core.c b/drivers/media/dvb/b2c2/b2c2-usb-core.c
index d46c8c0..6cc0502 100644 (file)
--- a/drivers/media/dvb/b2c2/b2c2-usb-core.c
+++ b/drivers/media/dvb/b2c2/b2c2-usb-core.c
@@ -33,7 +33,7 @@
 }
 
 static int debug;
-module_param(debug, int, 0x644);
+module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4 (or-able)).");
 
 #define deb_info(args...) dprintk(0x01,args)
@@ -89,8 +89,18 @@ struct usb_b2c2_usb {
 
 /* request types */
 typedef enum {
+
+/* something is wrong with this part
        RTYPE_READ_DW         = (1 << 6),
        RTYPE_WRITE_DW_1      = (3 << 6),
+       RTYPE_READ_V8_MEMORY  = (6 << 6),
+       RTYPE_WRITE_V8_MEMORY = (7 << 6),
+       RTYPE_WRITE_V8_FLASH  = (8 << 6),
+       RTYPE_GENERIC         = (9 << 6),
+*/
+       RTYPE_READ_DW = (3 << 6),
+       RTYPE_WRITE_DW_1 = (1 << 6),
+       
        RTYPE_READ_V8_MEMORY  = (6 << 6),
        RTYPE_WRITE_V8_MEMORY = (7 << 6),
        RTYPE_WRITE_V8_FLASH  = (8 << 6),
@@ -370,7 +380,7 @@ static void b2c2_exit_usb(struct usb_b2c2_usb *b2c2)
 
 static int b2c2_init_usb(struct usb_b2c2_usb *b2c2)
 {
-       u16 frame_size = b2c2->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize;
+       u16 frame_size = le16_to_cpu(b2c2->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize);
        int bufsize = B2C2_USB_NUM_ISO_URB * B2C2_USB_FRAMES_PER_ISO * frame_size,i,j,ret;
        int buffer_offset = 0;
 
@@ -391,9 +401,9 @@ static int b2c2_init_usb(struct usb_b2c2_usb *b2c2)
                }
        /* initialising and submitting iso urbs */
        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) {
-               deb_info("initializing and submitting urb no. %d (buf_offset: %d).\n",i,buffer_offset);
                int frame_offset = 0;
                struct urb *urb = b2c2->iso_urb[i];
+               deb_info("initializing and submitting urb no. %d (buf_offset: %d).\n",i,buffer_offset);
 
                urb->dev = b2c2->udev;
                urb->context = b2c2;