summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-12-14 08:28:36 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-07 07:42:19 -0200
commit09092787e0cf66e705b0d744f5f0c3b2b6495559 (patch)
tree7200db1a6dd03c476e35f106a4f30bdb2f1bba55 /drivers/media/pci/saa7134
parenta101b947d405b5c2c94f260867074a4466b7cbea (diff)
downloadblackbird-op-linux-09092787e0cf66e705b0d744f5f0c3b2b6495559.tar.gz
blackbird-op-linux-09092787e0cf66e705b0d744f5f0c3b2b6495559.zip
[media] saa6588: add support for non-blocking mode
saa6588 always blocked while waiting for data, even if the filehandle was in non-blocking mode. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134')
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 88e64055f0a4..36026b1cb3f8 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1285,6 +1285,7 @@ static ssize_t radio_read(struct file *file, char __user *data,
struct saa6588_command cmd;
cmd.block_count = count/3;
+ cmd.nonblocking = file->f_flags & O_NONBLOCK;
cmd.buffer = data;
cmd.instance = file;
cmd.result = -ENODEV;
OpenPOWER on IntegriCloud