vserver 1.9.3

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

diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index af46029..cd73a45 100644 (file)
--- a/drivers/usb/media/stv680.c
+++ b/drivers/usb/media/stv680.c
@@ -93,11 +93,11 @@ static unsigned int debug = 0;
 MODULE_AUTHOR (DRIVER_AUTHOR);
 MODULE_DESCRIPTION (DRIVER_DESC);
 MODULE_LICENSE ("GPL");
-MODULE_PARM (debug, "i");
+module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC (debug, "Debug enabled or not");
-MODULE_PARM (swapRGB_on, "i");
+module_param(swapRGB_on, int, 0);
 MODULE_PARM_DESC (swapRGB_on, "Red/blue swap: 1=always, 0=auto, -1=never");
-MODULE_PARM (video_nr, "i");
+module_param(video_nr, int, 0);
 
 /********************************************************************
  *
@@ -704,7 +704,6 @@ static int stv680_start_stream (struct usb_stv *stv680)
                                   usb_rcvbulkpipe (stv680->udev, stv680->bulk_in_endpointAddr),
                                   stv680->sbuf[i].data, stv680->rawbufsize,
                                   stv680_video_irq, stv680);
-               urb->timeout = PENCAM_TIMEOUT * 2;
                stv680->urb[i] = urb;
                err = usb_submit_urb (stv680->urb[i], GFP_KERNEL);
                if (err)