summaryrefslogtreecommitdiff
path: root/drivers/media/pci/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-12-14 15:28:36 +0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-07 13:42:19 +0400
commit09092787e0cf66e705b0d744f5f0c3b2b6495559 (patch)
tree7200db1a6dd03c476e35f106a4f30bdb2f1bba55 /drivers/media/pci/bt8xx/bttv-driver.c
parenta101b947d405b5c2c94f260867074a4466b7cbea (diff)
downloadlinux-09092787e0cf66e705b0d744f5f0c3b2b6495559.tar.xz
[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/bt8xx/bttv-driver.c')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 92a06fd85865..c2aaadcd9318 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3266,7 +3266,9 @@ static ssize_t radio_read(struct file *file, char __user *data,
struct bttv_fh *fh = file->private_data;
struct bttv *btv = fh->btv;
struct saa6588_command cmd;
- cmd.block_count = count/3;
+
+ cmd.block_count = count / 3;
+ cmd.nonblocking = file->f_flags & O_NONBLOCK;
cmd.buffer = data;
cmd.instance = file;
cmd.result = -ENODEV;