diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-31 18:05:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-31 18:05:05 -0300 |
| commit | 7a720bf4019f0daff79779605456a7460b4e2d33 (patch) | |
| tree | eacbed9d1b343a84ab609e88fd9ab9f15773366b /linux/drivers/media/video/saa7134/saa7134-video.c | |
| parent | f48ec98ff6423bfb2816b716ced5ec8873af6da0 (diff) | |
| download | mediapointer-dvb-s2-7a720bf4019f0daff79779605456a7460b4e2d33.tar.gz mediapointer-dvb-s2-7a720bf4019f0daff79779605456a7460b4e2d33.tar.bz2 | |
saa7134-video.c: Fix poll return condition
From: Figo.zhang <figo.zhang@kolorific.com>
In v2, when buf == NULL, it will goto err instead of returning
"PULLERR" without unlocking.
[mchehab@redhat.com: diff patch against v1 and v2 of saa7134-video.c: poll method lose race condition for capture video patch]
Signed-off-by: Figo.zhang <figo.zhang@kolorific.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-video.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 26f1727e6..20b66cb8d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1448,7 +1448,7 @@ video_poll(struct file *file, struct poll_table_struct *wait) } if (!buf) - rc = POLLERR; + goto err; poll_wait(file, &buf->done, wait); if (buf->state == VIDEOBUF_DONE || |