diff options
| author | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
| commit | b166ed22268f79cb34ef95ce95631331381717ff (patch) | |
| tree | c735880d90aa3bcfa36374817820416b38d8873a /linux/drivers/media/dvb/cinergyT2 | |
| parent | 6d40e62c1ad6249ce66d56629d0c76bcd064e3fd (diff) | |
| download | mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.gz mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.bz2 | |
various backport from 2.6.11-rc1:
- replace static spinlock initializations with spin_lock_init()
- add le16_to_cpu() macros to various values aquired via USB
- add __user annotations to user space pointers
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 9a69568a2..b1d205f52 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -541,7 +541,7 @@ static int cinergyt2_ioctl (struct inode *inode, struct file *file, switch (cmd) { case FE_GET_INFO: - return copy_to_user((void*) arg, &cinergyt2_fe_info, + return copy_to_user((void __user*) arg, &cinergyt2_fe_info, sizeof(struct dvb_frontend_info)); case FE_READ_STATUS: @@ -556,7 +556,7 @@ static int cinergyt2_ioctl (struct inode *inode, struct file *file, if (stat->lock_bits & (1 << 1)) status |= FE_HAS_VITERBI; - return copy_to_user((void *) arg, &status, sizeof(status)); + return copy_to_user((void __user*) arg, &status, sizeof(status)); case FE_READ_BER: return put_user(le32_to_cpu(stat->viterbi_error_rate), @@ -584,7 +584,7 @@ static int cinergyt2_ioctl (struct inode *inode, struct file *file, if ((file->f_flags & O_ACCMODE) == O_RDONLY) return -EPERM; - if (copy_from_user(&p, (void *) arg, sizeof(p))) + if (copy_from_user(&p, (void __user*) arg, sizeof(p))) return -EFAULT; if (down_interruptible(&cinergyt2->sem)) @@ -624,7 +624,7 @@ static int cinergyt2_ioctl (struct inode *inode, struct file *file, * for now we only fill the status field. the parameters * are trivial to fill as soon FE_GET_FRONTEND is done. */ - struct dvb_frontend_event *e = (void *) arg; + struct dvb_frontend_event __user *e = (void __user *) arg; if (cinergyt2->pending_fe_events == 0) { if (file->f_flags & O_NONBLOCK) return -EWOULDBLOCK; |