diff options
| author | Jean-François Moine <moinejf@free.fr> | 2011-01-13 09:27:37 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 14:45:37 +0100 |
| commit | ded5e903b75a9e2a9349e19063e3b2a63b05e828 (patch) | |
| tree | 916c1f2e64e99c9fde485e797c419c50cb7369f1 /drivers/media | |
| parent | [media] gspca: Remove __devinit, __devinitconst and __devinitdata (diff) | |
| download | linux-ded5e903b75a9e2a9349e19063e3b2a63b05e828.tar.xz linux-ded5e903b75a9e2a9349e19063e3b2a63b05e828.zip | |
[media] gspca: Remove useless instructions
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/gspca/jpeg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/jpeg.h b/drivers/media/video/gspca/jpeg.h index de63c36806c0..ab54910418b4 100644 --- a/drivers/media/video/gspca/jpeg.h +++ b/drivers/media/video/gspca/jpeg.h @@ -141,9 +141,9 @@ static void jpeg_define(u8 *jpeg_hdr, memcpy(jpeg_hdr, jpeg_head, sizeof jpeg_head); #ifndef CONEX_CAM jpeg_hdr[JPEG_HEIGHT_OFFSET + 0] = height >> 8; - jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height & 0xff; + jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height; jpeg_hdr[JPEG_HEIGHT_OFFSET + 2] = width >> 8; - jpeg_hdr[JPEG_HEIGHT_OFFSET + 3] = width & 0xff; + jpeg_hdr[JPEG_HEIGHT_OFFSET + 3] = width; jpeg_hdr[JPEG_HEIGHT_OFFSET + 6] = samplesY; #endif } |