diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /drivers/sbus/char/weitek.c | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'drivers/sbus/char/weitek.c')
| -rw-r--r-- | drivers/sbus/char/weitek.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/sbus/char/weitek.c b/drivers/sbus/char/weitek.c index d2ac4d135..7b7b1bd72 100644 --- a/drivers/sbus/char/weitek.c +++ b/drivers/sbus/char/weitek.c @@ -1,4 +1,4 @@ -/* $Id: weitek.c,v 1.12 1997/06/04 08:27:34 davem Exp $ +/* $Id: weitek.c,v 1.14 1997/07/17 02:21:53 davem Exp $ * weitek.c: Tadpole P9100/P9000 console driver * * Copyright (C) 1996 David Redman (djhr@tadpole.co.uk) @@ -41,7 +41,7 @@ weitek_mmap(struct inode *inode, struct file *file, struct vm_area_struct *vma, long base, fbinfo_t *fb) { unsigned int size, page, r, map_size; - unsigned int map_offset = 0; + unsigned long map_offset = 0; size = vma->vm_end - vma->vm_start; if (vma->vm_offset & ~PAGE_MASK) @@ -79,11 +79,12 @@ weitek_mmap(struct inode *inode, struct file *file, struct vm_area_struct *vma, map_offset, map_size, vma->vm_page_prot, fb->space); - if (r) return -EAGAIN; + if (r) + return -EAGAIN; page += map_size; } - vma->vm_inode = inode; - atomic_inc(&inode->i_count); + + vma->vm_dentry = dget(file->f_dentry); return 0; } #endif |