diff --git a/[refs] b/[refs]
index 8e1898f3a67a..26d3ee30c041 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d04df4997b530d978d48a66655a99714af197ca
+refs/heads/master: d8370f7eff14ef646ba4a81eb9642800518a7324
diff --git a/trunk/drivers/media/video/gspca/jeilinj.c b/trunk/drivers/media/video/gspca/jeilinj.c
index dbfa3ed6e8ef..a11c97ebeb0f 100644
--- a/trunk/drivers/media/video/gspca/jeilinj.c
+++ b/trunk/drivers/media/video/gspca/jeilinj.c
@@ -312,6 +312,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
 	/* create the JPEG header */
 	dev->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL);
+	if (dev->jpeg_hdr == NULL)
+		return -ENOMEM;
 	jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
 			0x21);          /* JPEG 422 */
 	jpeg_set_qual(dev->jpeg_hdr, dev->quality);