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
/
meye.c
diff --git
a/drivers/media/video/meye.c
b/drivers/media/video/meye.c
index
e278753
..
616a35d
100644
(file)
--- a/
drivers/media/video/meye.c
+++ b/
drivers/media/video/meye.c
@@
-786,7
+786,7
@@
static void mchip_cont_compression_start(void)
/* Interrupt handling */
/****************************************************************************/
/* Interrupt handling */
/****************************************************************************/
-static irqreturn_t meye_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t meye_irq(int irq, void *dev_id)
{
u32 v;
int reqnr;
{
u32 v;
int reqnr;
@@
-923,7
+923,7
@@
static int meye_do_ioctl(struct inode *inode, struct file *file,
struct video_picture *p = arg;
if (p->depth != 16)
return -EINVAL;
struct video_picture *p = arg;
if (p->depth != 16)
return -EINVAL;
- if (p->palette != VIDEO_PALETTE_YUV422)
+ if (p->palette != VIDEO_PALETTE_YUV422
&& p->palette != VIDEO_PALETTE_YUYV
)
return -EINVAL;
mutex_lock(&meye.lock);
sonypi_camera_command(SONYPI_COMMAND_SETCAMERABRIGHTNESS,
return -EINVAL;
mutex_lock(&meye.lock);
sonypi_camera_command(SONYPI_COMMAND_SETCAMERABRIGHTNESS,
@@
-978,7
+978,7
@@
static int meye_do_ioctl(struct inode *inode, struct file *file,
if (vm->frame >= gbuffers || vm->frame < 0)
return -EINVAL;
if (vm->frame >= gbuffers || vm->frame < 0)
return -EINVAL;
- if (vm->format != VIDEO_PALETTE_YUV422)
+ if (vm->format != VIDEO_PALETTE_YUV422
&& vm->format != VIDEO_PALETTE_YUYV
)
return -EINVAL;
if (vm->height * vm->width * 2 > gbufsize)
return -EINVAL;
return -EINVAL;
if (vm->height * vm->width * 2 > gbufsize)
return -EINVAL;