Skip to contentSkip to conversation

dst_ca __user annotations, portability fixes

PATCH New Al Viro 1 participant 1 message Dec 15, 2005 Media (V4L/DVB)

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 dst_ca __user annotations, portability fixes

---

 drivers/media/dvb/bt8xx/dst_ca.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

29802c31b614ae72efd4aee01ec4349fa3098905

drivers/media/dvb/bt8xx/dst_ca.c +3 -3
index e6541af..2239651 100644
@@ -406,7 +406,7 @@ static int ca_send_message(struct dst_st
 	}
 	dprintk(verbose, DST_CA_DEBUG, 1, " ");
 
-	if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) {
+	if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) {
 		result = -EFAULT;
 		goto free_mem_and_exit;
 	}
@@ -579,7 +579,7 @@ static int dst_ca_release(struct inode *
 	return 0;
 }
 
-static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
 {
 	int bytes_read = 0;
 
@@ -588,7 +588,7 @@ static int dst_ca_read(struct file *file
 	return bytes_read;
 }
 
-static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
 {
 	dprintk(verbose, DST_CA_DEBUG, 1, " Device write.");
 
Signature · 1 line
0.99.9.GIT