git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
usb
/
media
/
konicawc.c
diff --git
a/drivers/usb/media/konicawc.c
b/drivers/usb/media/konicawc.c
index
311138c
..
3376654
100644
(file)
--- a/
drivers/usb/media/konicawc.c
+++ b/
drivers/usb/media/konicawc.c
@@
-68,7
+68,7
@@
static const int debug = 0;
/* Some default values for initial camera settings,
can be set by modprobe */
/* Some default values for initial camera settings,
can be set by modprobe */
-static
enum frame_sizes size;
+static
int size;
static int speed = 6; /* Speed (fps) 0 (slowest) to 6 (fastest) */
static int brightness = MAX_BRIGHTNESS/2;
static int contrast = MAX_CONTRAST/2;
static int speed = 6; /* Speed (fps) 0 (slowest) to 6 (fastest) */
static int brightness = MAX_BRIGHTNESS/2;
static int contrast = MAX_CONTRAST/2;
@@
-324,7
+324,7
@@
static void resubmit_urb(struct uvd *uvd, struct urb *urb)
}
urb->dev = uvd->dev;
urb->status = 0;
}
urb->dev = uvd->dev;
urb->status = 0;
-
ret = usb_submit_urb(urb, GFP_KERNEL
);
+
ret = usb_submit_urb(urb, GFP_ATOMIC
);
DEBUG(3, "submitting urb of length %d", urb->transfer_buffer_length);
if(ret)
err("usb_submit_urb error (%d)", ret);
DEBUG(3, "submitting urb of length %d", urb->transfer_buffer_length);
if(ret)
err("usb_submit_urb error (%d)", ret);
@@
-362,8
+362,8
@@
static void konicawc_isoc_irq(struct urb *urb, struct pt_regs *regs)
else if (!urb->status && !cam->last_data_urb->status)
len = konicawc_compress_iso(uvd, cam->last_data_urb, urb);
else if (!urb->status && !cam->last_data_urb->status)
len = konicawc_compress_iso(uvd, cam->last_data_urb, urb);
- resubmit_urb(uvd, urb);
resubmit_urb(uvd, cam->last_data_urb);
resubmit_urb(uvd, cam->last_data_urb);
+ resubmit_urb(uvd, urb);
cam->last_data_urb = NULL;
uvd->stats.urb_length = len;
uvd->stats.data_count += len;
cam->last_data_urb = NULL;
uvd->stats.urb_length = len;
uvd->stats.data_count += len;
@@
-928,23
+928,23
@@
MODULE_DEVICE_TABLE(usb, id_table);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Simon Evans <spse@secret.org.uk>");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Simon Evans <spse@secret.org.uk>");
MODULE_DESCRIPTION(DRIVER_DESC);
-
MODULE_PARM(speed, "i"
);
+
module_param(speed, int, 0
);
MODULE_PARM_DESC(speed, "Initial speed: 0 (slowest) - 6 (fastest)");
MODULE_PARM_DESC(speed, "Initial speed: 0 (slowest) - 6 (fastest)");
-
MODULE_PARM(size, "i"
);
+
module_param(size, int, 0
);
MODULE_PARM_DESC(size, "Initial Size 0: 160x120 1: 160x136 2: 176x144 3: 320x240");
MODULE_PARM_DESC(size, "Initial Size 0: 160x120 1: 160x136 2: 176x144 3: 320x240");
-
MODULE_PARM(brightness, "i"
);
+
module_param(brightness, int, 0
);
MODULE_PARM_DESC(brightness, "Initial brightness 0 - 108");
MODULE_PARM_DESC(brightness, "Initial brightness 0 - 108");
-
MODULE_PARM(contrast, "i"
);
+
module_param(contrast, int, 0
);
MODULE_PARM_DESC(contrast, "Initial contrast 0 - 108");
MODULE_PARM_DESC(contrast, "Initial contrast 0 - 108");
-
MODULE_PARM(saturation, "i"
);
+
module_param(saturation, int, 0
);
MODULE_PARM_DESC(saturation, "Initial saturation 0 - 108");
MODULE_PARM_DESC(saturation, "Initial saturation 0 - 108");
-
MODULE_PARM(sharpness, "i"
);
+
module_param(sharpness, int, 0
);
MODULE_PARM_DESC(sharpness, "Initial brightness 0 - 108");
MODULE_PARM_DESC(sharpness, "Initial brightness 0 - 108");
-
MODULE_PARM(whitebal, "i"
);
+
module_param(whitebal, int, 0
);
MODULE_PARM_DESC(whitebal, "Initial white balance 0 - 363");
#ifdef CONFIG_USB_DEBUG
MODULE_PARM_DESC(whitebal, "Initial white balance 0 - 363");
#ifdef CONFIG_USB_DEBUG
-
MODULE_PARM(debug, "i"
);
+
module_param(debug, int, S_IRUGO | S_IWUSR
);
MODULE_PARM_DESC(debug, "Debug level: 0-9 (default=0)");
#endif
MODULE_PARM_DESC(debug, "Debug level: 0-9 (default=0)");
#endif