vserver 2.0 rc7

[linux-2.6.git] / drivers / media / video / cpia_usb.c

diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 0bf9349..cdda423 100644 (file)
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -308,7 +308,7 @@ static int WritePacket(struct usb_device *udev, const u8 *packet, u8 *buf, size_
                         packet[1] + (packet[0] << 8),
                         USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                         packet[2] + (packet[3] << 8), 
-                        packet[4] + (packet[5] << 8), buf, size, HZ);
+                        packet[4] + (packet[5] << 8), buf, size, 1000);
 }
 
 /****************************************************************************
@@ -325,7 +325,7 @@ static int ReadPacket(struct usb_device *udev, u8 *packet, u8 *buf, size_t size)
                         packet[1] + (packet[0] << 8),
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                         packet[2] + (packet[3] << 8), 
-                        packet[4] + (packet[5] << 8), buf, size, HZ);
+                        packet[4] + (packet[5] << 8), buf, size, 1000);
 }
 
 static int cpia_usb_transferCmd(void *privdata, u8 *command, u8 *data)
@@ -440,7 +440,7 @@ static void cpia_usb_free_resources(struct usb_cpia *ucpia, int try)
 
        /* Unschedule all of the iso td's */
        if (ucpia->sbuf[1].urb) {
-               usb_unlink_urb(ucpia->sbuf[1].urb);
+               usb_kill_urb(ucpia->sbuf[1].urb);
                usb_free_urb(ucpia->sbuf[1].urb);
                ucpia->sbuf[1].urb = NULL;
        }
@@ -451,7 +451,7 @@ static void cpia_usb_free_resources(struct usb_cpia *ucpia, int try)
        }
  
        if (ucpia->sbuf[0].urb) {
-               usb_unlink_urb(ucpia->sbuf[0].urb);
+               usb_kill_urb(ucpia->sbuf[0].urb);
                usb_free_urb(ucpia->sbuf[0].urb);
                ucpia->sbuf[0].urb = NULL;
        }