diff options
Diffstat (limited to 'drivers/media/video/zoran/zoran_driver.c')
-rw-r--r-- | drivers/media/video/zoran/zoran_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index 2ddffed019e..ec41303544e 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
@@ -324,7 +324,7 @@ static int jpg_fbuffer_alloc(struct zoran_fh *fh) | |||
324 | /* Allocate fragment table for this buffer */ | 324 | /* Allocate fragment table for this buffer */ |
325 | 325 | ||
326 | mem = (void *)get_zeroed_page(GFP_KERNEL); | 326 | mem = (void *)get_zeroed_page(GFP_KERNEL); |
327 | if (mem == 0) { | 327 | if (!mem) { |
328 | dprintk(1, | 328 | dprintk(1, |
329 | KERN_ERR | 329 | KERN_ERR |
330 | "%s: %s - get_zeroed_page (frag_tab) failed for buffer %d\n", | 330 | "%s: %s - get_zeroed_page (frag_tab) failed for buffer %d\n", |
@@ -1444,7 +1444,7 @@ zoran_set_norm (struct zoran *zr, | |||
1444 | } | 1444 | } |
1445 | 1445 | ||
1446 | if (norm == V4L2_STD_ALL) { | 1446 | if (norm == V4L2_STD_ALL) { |
1447 | int status = 0; | 1447 | unsigned int status = 0; |
1448 | v4l2_std_id std = 0; | 1448 | v4l2_std_id std = 0; |
1449 | 1449 | ||
1450 | decoder_call(zr, video, querystd, &std); | 1450 | decoder_call(zr, video, querystd, &std); |