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

Thomas Schlichter (schlicht@uni-mannheim.de)
Wed, 11 Jun 2003 12:13:53 +0200


--Boundary-03=_nDw5+MKwr93ulo4
Content-Type: multipart/mixed;
boundary="Boundary-01=_hDw5+GFuxJ6ay8u"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_hDw5+GFuxJ6ay8u
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi,

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

Best regards
Thomas Schlichter

--Boundary-01=_hDw5+GFuxJ6ay8u
Content-Type: text/x-diff;
charset="iso-8859-1";
name="vicam.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline; filename="vicam.diff"

=2D-- linux-2.5.70-mm8/drivers/usb/media/vicam.c.orig Wed Jun 11 11:43:48 2=
003
+++ linux-2.5.70-mm8/drivers/usb/media/vicam.c Wed Jun 11 11:47:25 2003
@@ -618,13 +618,13 @@
break;
}
=20
=2D DBG("VIDIOCSPICT depth =3D %d, pal =3D %d\n", vp->depth,
=2D vp->palette);
+ DBG("VIDIOCSPICT depth =3D %d, pal =3D %d\n", vp.depth,
+ vp.palette);
=20
=2D cam->gain =3D vp->brightness >> 8;
+ cam->gain =3D vp.brightness >> 8;
=20
=2D if (vp->depth !=3D 24
=2D || vp->palette !=3D VIDEO_PALETTE_RGB24)
+ if (vp.depth !=3D 24
+ || vp.palette !=3D VIDEO_PALETTE_RGB24)
retval =3D -EINVAL;
=20
break;
@@ -663,9 +663,9 @@
retval =3D -EFAULT;
break;
}
=2D DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+ DBG("VIDIOCSWIN %d x %d\n", vw.width, vw.height);
=20
=2D if ( vw->width !=3D 320 || vw->height !=3D 240 )
+ if ( vw.width !=3D 320 || vw.height !=3D 240 )
retval =3D -EFAULT;
=09
break;

--Boundary-01=_hDw5+GFuxJ6ay8u--

--Boundary-03=_nDw5+MKwr93ulo4
Content-Type: application/pgp-signature
Content-Description: signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQA+5wDnYAiN+WRIZzQRAulpAKCMpUVkkfhldZjiRn046EePImrLoQCg/dMv
eFiqnld6Y9WbSVIgUHShEhk=
=6ym4
-----END PGP SIGNATURE-----

--Boundary-03=_nDw5+MKwr93ulo4--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/