[PATCH] Compile fix for 2.5.70-mm8/drivers/usb/media/vicam.c

Thomas Schlichter
2003-06-11T10:00:34Z

[-- Attachment #1.1: Type: text/plain, Size: 265 bytes --]

Hi,

it seems a copy_from_user() cleanup for the file mentioned above introduced
compile errors. This cleanup is (not yet) present in linus' tree and I do not
know who was the author of it, so I send this patch to you...

Best regards
Thomas Schlichter

[-- Attachment #1.2: vicam.diff --]
[-- Type: text/x-diff, Size: 941 bytes --]

--- linux-2.5.70-mm8/drivers/usb/media/vicam.c.orig Wed Jun 11 11:43:48 2003
+++ linux-2.5.70-mm8/drivers/usb/media/vicam.c Wed Jun 11 11:47:25 2003
@@ -618,13 +618,13 @@
break;
}

- DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp->depth,
- vp->palette);
+ DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp.depth,
+ vp.palette);

- cam->gain = vp->brightness >> 8;
+ cam->gain = vp.brightness >> 8;

- if (vp->depth != 24
- || vp->palette != VIDEO_PALETTE_RGB24)
+ if (vp.depth != 24
+ || vp.palette != VIDEO_PALETTE_RGB24)
retval = -EINVAL;

break;
@@ -663,9 +663,9 @@
retval = -EFAULT;
break;
}
- DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+ DBG("VIDIOCSWIN %d x %d\n", vw.width, vw.height);

- if ( vw->width != 320 || vw->height != 240 )
+ if ( vw.width != 320 || vw.height != 240 )
retval = -EFAULT;

break;

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]