summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/dvb/bt8xx/dst_ca.c2
-rw-r--r--v4l/ChangeLog9
2 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dst_ca.c b/linux/drivers/media/dvb/bt8xx/dst_ca.c
index 18e215753..ad3970505 100644
--- a/linux/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/linux/drivers/media/dvb/bt8xx/dst_ca.c
@@ -407,7 +407,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
}
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;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e804115da..c507f0723 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-27 00:40 mchehab
+
+ * linux/drivers/media/dvb/bt8xx/dst_ca.c: (ca_send_message):
+ - dst_ca __user annotations, portability fixes
+
+ Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-26 19:54 mkrufky
* v4l/scripts/insmod.sh: