diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /drivers/media/video/gspca/mars.c | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/media/video/gspca/mars.c')
| -rw-r--r-- | drivers/media/video/gspca/mars.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index 75e8d14e4ac7..de769caf013d 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
| @@ -201,6 +201,8 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 201 | 201 | ||
| 202 | /* create the JPEG header */ | 202 | /* create the JPEG header */ |
| 203 | sd->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL); | 203 | sd->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL); |
| 204 | if (!sd->jpeg_hdr) | ||
| 205 | return -ENOMEM; | ||
| 204 | jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width, | 206 | jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width, |
| 205 | 0x21); /* JPEG 422 */ | 207 | 0x21); /* JPEG 422 */ |
| 206 | jpeg_set_qual(sd->jpeg_hdr, sd->quality); | 208 | jpeg_set_qual(sd->jpeg_hdr, sd->quality); |