projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eb70ac1
)
[media] saa7146: fix compiler warning
author
Hans Verkuil
<hans.verkuil@cisco.com>
Thu, 25 Aug 2011 12:54:30 +0000
(09:54 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Tue, 6 Sep 2011 17:40:09 +0000
(14:40 -0300)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146_video.c
patch
|
blob
|
history
diff --git
a/drivers/media/common/saa7146_video.c
b/drivers/media/common/saa7146_video.c
index
fcdf4a0
..
384b358
100644
(file)
--- a/
drivers/media/common/saa7146_video.c
+++ b/
drivers/media/common/saa7146_video.c
@@
-1356,18
+1356,14
@@
static void video_close(struct saa7146_dev *dev, struct file *file)
struct saa7146_fh *fh = file->private_data;
struct saa7146_vv *vv = dev->vv_data;
struct videobuf_queue *q = &fh->video_q;
- int err;
- if (IS_CAPTURE_ACTIVE(fh) != 0) {
- err = video_end(fh, file);
- } else if (IS_OVERLAY_ACTIVE(fh) != 0) {
- err = saa7146_stop_preview(fh);
- }
+ if (IS_CAPTURE_ACTIVE(fh) != 0)
+ video_end(fh, file);
+ else if (IS_OVERLAY_ACTIVE(fh) != 0)
+ saa7146_stop_preview(fh);
videobuf_stop(q);
-
/* hmm, why is this function declared void? */
- /* return err */
}