summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2010-03-21 20:33:27 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2010-03-21 20:33:27 +0000
commit7991bff1f358e06b188ee6aa3622d16ddecaa510 (patch)
treec26dc8c5f17cef5e4d988d6dae39ab84465030e2
parent7d51a3b9744d80cab8198f058a2e76fdbb4ed751 (diff)
fix two cases of missing __user annotation (sparse)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8370 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/dahdi-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index d0aa29c..6a34d04 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -3877,7 +3877,7 @@ static int dahdi_common_ioctl(struct file *file, unsigned int cmd, unsigned long
case DAHDI_SPANSTAT_V1:
size_to_copy = sizeof(struct dahdi_spaninfo_v1);
if (copy_from_user(&stack.spaninfo_v1,
- (struct dahdi_spaninfo_v1 *) data,
+ (__user struct dahdi_spaninfo_v1 *) data,
size_to_copy))
return -EFAULT;
i = stack.spaninfo_v1.spanno; /* get specified span number */
@@ -3939,7 +3939,7 @@ static int dahdi_common_ioctl(struct file *file, unsigned int cmd, unsigned long
spans[i]->spantype,
sizeof(stack.spaninfo_v1.spantype));
- if (copy_to_user((struct dahdi_spaninfo_v1 *) data,
+ if (copy_to_user((__user struct dahdi_spaninfo_v1 *) data,
&stack.spaninfo_v1, size_to_copy))
return -EFAULT;
break;