summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ddbridge
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-08-25 09:59:16 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-06 14:42:59 -0300
commit2122eaf64acd9ca42645b4bf8f222c7d452313f1 (patch)
tree43039d6d572a39b3400354fa42ab24d775646b30 /drivers/media/dvb/ddbridge
parent7b4668efc4a8f75d12337cf8013307a7ec437878 (diff)
downloadop-kernel-dev-2122eaf64acd9ca42645b4bf8f222c7d452313f1.zip
op-kernel-dev-2122eaf64acd9ca42645b4bf8f222c7d452313f1.tar.gz
[media] ddbridge: fix compiler warnings
'off' was unused and 'ret' really had to be used to return -EFAULT. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ddbridge')
-rw-r--r--drivers/media/dvb/ddbridge/ddbridge-core.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
index fe56703..ba9a643 100644
--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
@@ -507,15 +507,14 @@ static u32 ddb_input_avail(struct ddb_input *input)
return 0;
}
-static size_t ddb_input_read(struct ddb_input *input, u8 *buf, size_t count)
+static ssize_t ddb_input_read(struct ddb_input *input, u8 *buf, size_t count)
{
struct ddb *dev = input->port->dev;
u32 left = count;
- u32 idx, off, free, stat = input->stat;
+ u32 idx, free, stat = input->stat;
int ret;
idx = (stat >> 11) & 0x1f;
- off = (stat & 0x7ff) << 7;
while (left) {
if (input->cbuf == idx)
@@ -525,6 +524,8 @@ static size_t ddb_input_read(struct ddb_input *input, u8 *buf, size_t count)
free = left;
ret = copy_to_user(buf, input->vbuf[input->cbuf] +
input->coff, free);
+ if (ret)
+ return -EFAULT;
input->coff += free;
if (input->coff == input->dma_buf_size) {
input->coff = 0;
@@ -939,6 +940,8 @@ static ssize_t ts_read(struct file *file, char *buf,
break;
}
read = ddb_input_read(input, buf, left);
+ if (read < 0)
+ return read;
left -= read;
buf += read;
}
OpenPOWER on IntegriCloud