diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2005-12-15 04:18:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-15 13:04:31 -0500 |
commit | 94299171dd269aab0c97f6254cedb381f10e6348 (patch) | |
tree | fba5635a819de47c60ad70b991c4c39cac341bd5 | |
parent | b3e5b5b2277f9c047082dcb309f665fe8b5706c1 (diff) |
[PATCH] dst_ca __user annotations, portability fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/dvb/bt8xx/dst_ca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index e6541aff3996..2239651969c8 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -406,7 +406,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, | |||
406 | } | 406 | } |
407 | dprintk(verbose, DST_CA_DEBUG, 1, " "); | 407 | dprintk(verbose, DST_CA_DEBUG, 1, " "); |
408 | 408 | ||
409 | if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) { | 409 | if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) { |
410 | result = -EFAULT; | 410 | result = -EFAULT; |
411 | goto free_mem_and_exit; | 411 | goto free_mem_and_exit; |
412 | } | 412 | } |
@@ -579,7 +579,7 @@ static int dst_ca_release(struct inode *inode, struct file *file) | |||
579 | return 0; | 579 | return 0; |
580 | } | 580 | } |
581 | 581 | ||
582 | static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset) | 582 | static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset) |
583 | { | 583 | { |
584 | int bytes_read = 0; | 584 | int bytes_read = 0; |
585 | 585 | ||
@@ -588,7 +588,7 @@ static int dst_ca_read(struct file *file, char __user *buffer, size_t length, lo | |||
588 | return bytes_read; | 588 | return bytes_read; |
589 | } | 589 | } |
590 | 590 | ||
591 | static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset) | 591 | static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset) |
592 | { | 592 | { |
593 | dprintk(verbose, DST_CA_DEBUG, 1, " Device write."); | 593 | dprintk(verbose, DST_CA_DEBUG, 1, " Device write."); |
594 | 594 | ||