diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:04 -0500 |
commit | 2ea7533060e361810c21b2f5ee02151c4dfb85d8 (patch) | |
tree | 9d8a5375c716879142dff583dfa6abddd79fefcc /drivers/media/video/bttv-driver.c | |
parent | 17fd682e544556a2a829e94383239c029bb21c5e (diff) |
[PATCH] kfree cleanup: drivers/media
This is the drivers/media/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in drivers/media/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Johannes Stezenbach <js@linuxtv.org>
Cc: Michael Krufky <mkrufky@m1k.net>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Acked-by : Manu Abraham <manu@linuxtv.org>
Acked-by: Andreas Oberritter <obi@linuxtv.org>
Acked-by: Wilson Michaels <wilsonmichaels@earthlink.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/bttv-driver.c')
-rw-r--r-- | drivers/media/video/bttv-driver.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index c062a017491e..d538a994ff04 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
@@ -1951,8 +1951,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv, | |||
1951 | } | 1951 | } |
1952 | 1952 | ||
1953 | down(&fh->cap.lock); | 1953 | down(&fh->cap.lock); |
1954 | if (fh->ov.clips) | 1954 | kfree(fh->ov.clips); |
1955 | kfree(fh->ov.clips); | ||
1956 | fh->ov.clips = clips; | 1955 | fh->ov.clips = clips; |
1957 | fh->ov.nclips = n; | 1956 | fh->ov.nclips = n; |
1958 | 1957 | ||
@@ -2723,8 +2722,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, | |||
2723 | fh->ov.w.height = fb->fmt.height; | 2722 | fh->ov.w.height = fb->fmt.height; |
2724 | btv->init.ov.w.width = fb->fmt.width; | 2723 | btv->init.ov.w.width = fb->fmt.width; |
2725 | btv->init.ov.w.height = fb->fmt.height; | 2724 | btv->init.ov.w.height = fb->fmt.height; |
2726 | if (fh->ov.clips) | 2725 | kfree(fh->ov.clips); |
2727 | kfree(fh->ov.clips); | ||
2728 | fh->ov.clips = NULL; | 2726 | fh->ov.clips = NULL; |
2729 | fh->ov.nclips = 0; | 2727 | fh->ov.nclips = 0; |
2730 | 2728 | ||