diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 06:54:22 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 07:01:46 +0200 |
commit | 287b62163eed8811b6cd33716c0691d328947d48 (patch) | |
tree | 3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /drivers | |
parent | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff) | |
parent | b411278fbb00767b8013604157a43e0203f66f4c (diff) | |
download | mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2 mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz |
Merge svn changes up to r29912
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mga_vid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c index fdbfe04d1b..8330be29d6 100644 --- a/drivers/mga_vid.c +++ b/drivers/mga_vid.c @@ -1197,7 +1197,7 @@ static int mga_vid_ioctl(struct inode *inode, struct file *file, unsigned int cm tmp = MGA_VID_VERSION; if (copy_to_user((uint32_t *) arg, &tmp, sizeof(uint32_t))) { printk(KERN_ERR "mga_vid: failed copy %p to userspace %p\n", &tmp, (uint32_t *) arg); - return (-EFAULT); + return -EFAULT; } break; |