diff options
| author | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
| commit | 012a5299a29672039f42944a37984558393ef769 (patch) | |
| tree | de0815c67cf4156c32c8b552cd7448387cc391b0 /drivers/media/video/gspca/conex.c | |
| parent | da34d4248bd2013ee64ce51e63ec0ebd1f32b46c (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/media/video/gspca/conex.c')
| -rw-r--r-- | drivers/media/video/gspca/conex.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c index 219cfa6fb877..8d48ea1742c2 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/video/gspca/conex.c | |||
| @@ -846,6 +846,8 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 846 | 846 | ||
| 847 | /* create the JPEG header */ | 847 | /* create the JPEG header */ |
| 848 | sd->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL); | 848 | sd->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL); |
| 849 | if (!sd->jpeg_hdr) | ||
| 850 | return -ENOMEM; | ||
| 849 | jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width, | 851 | jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width, |
| 850 | 0x22); /* JPEG 411 */ | 852 | 0x22); /* JPEG 411 */ |
| 851 | jpeg_set_qual(sd->jpeg_hdr, sd->quality); | 853 | jpeg_set_qual(sd->jpeg_hdr, sd->quality); |