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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
usbvideo
/
usbvideo.c
diff --git
a/drivers/media/video/usbvideo/usbvideo.c
b/drivers/media/video/usbvideo/usbvideo.c
index
13b37c8
..
b560c9d
100644
(file)
--- a/
drivers/media/video/usbvideo/usbvideo.c
+++ b/
drivers/media/video/usbvideo/usbvideo.c
@@
-690,7
+690,7
@@
int usbvideo_register(
}
base_size = num_cams * sizeof(struct uvd) + sizeof(struct usbvideo);
}
base_size = num_cams * sizeof(struct uvd) + sizeof(struct usbvideo);
- cams =
(struct usbvideo *)
kzalloc(base_size, GFP_KERNEL);
+ cams = kzalloc(base_size, GFP_KERNEL);
if (cams == NULL) {
err("Failed to allocate %d. bytes for usbvideo struct", base_size);
return -ENOMEM;
if (cams == NULL) {
err("Failed to allocate %d. bytes for usbvideo struct", base_size);
return -ENOMEM;
@@
-1680,7
+1680,7
@@
static int usbvideo_CompressIsochronous(struct uvd *uvd, struct urb *urb)
return totlen;
}
return totlen;
}
-static void usbvideo_IsocIrq(struct urb *urb
, struct pt_regs *regs
)
+static void usbvideo_IsocIrq(struct urb *urb)
{
int i, ret, len;
struct uvd *uvd = urb->context;
{
int i, ret, len;
struct uvd *uvd = urb->context;