upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / usb / media / konicawc.c

diff --git a/drivers/usb/media/konicawc.c b/drivers/usb/media/konicawc.c
index 3376654..aca3093 100644 (file)
--- a/drivers/usb/media/konicawc.c
+++ b/drivers/usb/media/konicawc.c
@@ -474,13 +474,8 @@ static void konicawc_stop_data(struct uvd *uvd)
 
        /* Unschedule all of the iso td's */
        for (i=0; i < USBVIDEO_NUMSBUF; i++) {
-               j = usb_unlink_urb(uvd->sbuf[i].urb);
-               if (j < 0)
-                       err("usb_unlink_urb() error %d.", j);
-
-               j = usb_unlink_urb(cam->sts_urb[i]);
-               if (j < 0)
-                       err("usb_unlink_urb() error %d.", j);
+               usb_kill_urb(uvd->sbuf[i].urb);
+               usb_kill_urb(cam->sts_urb[i]);
        }
 
        if (!uvd->remove_pending) {