diff options
| author | Richard Knutsson <ricknu-0@student.ltu.se> | 2007-12-08 16:35:06 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-26 00:03:26 +0300 |
| commit | 14d5deba2737c59444e805c10764d58a3d73e9b2 (patch) | |
| tree | 89caa43d90e9c622261ede8f81999a7aee158aa8 /drivers/media/video/ivtv/ivtvfb.c | |
| parent | d130fa8a05ee5f39c786df02dd75d1eebb12633b (diff) | |
| download | linux-14d5deba2737c59444e805c10764d58a3d73e9b2.tar.xz | |
V4L/DVB (6776): ivtv: Some general fixes
Fix "warning: Using plain integer as NULL pointer".
Convert 'x < y ? x : y' to use min() instead.
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtvfb.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtvfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 1a73038ea811..3b23fc05f7c4 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -1057,7 +1057,7 @@ static int ivtvfb_init_card(struct ivtv *itv) } itv->osd_info = kzalloc(sizeof(struct osd_info), GFP_ATOMIC); - if (itv->osd_info == 0) { + if (itv->osd_info == NULL) { IVTVFB_ERR("Failed to allocate memory for osd_info\n"); return -ENOMEM; } |