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 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
spca500.c
diff --git
a/drivers/media/video/gspca/spca500.c
b/drivers/media/video/gspca/spca500.c
index
8806b2f
..
fab7ef8
100644
(file)
--- a/
drivers/media/video/gspca/spca500.c
+++ b/
drivers/media/video/gspca/spca500.c
@@
-670,6
+670,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);