git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
stk014.c
diff --git
a/drivers/media/video/gspca/stk014.c
b/drivers/media/video/gspca/stk014.c
index
f25be20
..
4762896
100644
(file)
--- a/
drivers/media/video/gspca/stk014.c
+++ b/
drivers/media/video/gspca/stk014.c
@@
-333,6
+333,8
@@
static int sd_start(struct gspca_dev *gspca_dev)
/* create the JPEG header */
sd->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL);
+ if (!sd->jpeg_hdr)
+ return -ENOMEM;
jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
0x22); /* JPEG 411 */
jpeg_set_qual(sd->jpeg_hdr, sd->quality);