diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2007-12-08 08:35:06 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:03:26 -0500 |
commit | 14d5deba2737c59444e805c10764d58a3d73e9b2 (patch) | |
tree | 89caa43d90e9c622261ede8f81999a7aee158aa8 /drivers/media/video/ivtv/ivtv-driver.c | |
parent | d130fa8a05ee5f39c786df02dd75d1eebb12633b (diff) |
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/ivtv-driver.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 4994dc59d40c..2765624b230f 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -983,7 +983,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, | |||
983 | } | 983 | } |
984 | 984 | ||
985 | itv = kzalloc(sizeof(struct ivtv), GFP_ATOMIC); | 985 | itv = kzalloc(sizeof(struct ivtv), GFP_ATOMIC); |
986 | if (itv == 0) { | 986 | if (itv == NULL) { |
987 | spin_unlock(&ivtv_cards_lock); | 987 | spin_unlock(&ivtv_cards_lock); |
988 | return -ENOMEM; | 988 | return -ENOMEM; |
989 | } | 989 | } |