diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-11 12:37:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-12 22:05:33 -0500 |
commit | f1e65e494c7914220ac6d87caa126114f46ac462 (patch) | |
tree | d2beafd0aa451bab75b127ffa16018e377a13f5a | |
parent | a4c8ae2e72bdb85f6dfdfad82bec0df1e2749ac5 (diff) |
au1200fb: io_remap_pfn_range() sets VM_IO
commit 1fca06fafb235a88c4fa91294aa1726c0e22855b upstream.
... and single return is quite sufficient to get out of function, TYVM
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/video/au1200fb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index 1b59054fc6a4..301224ecc950 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
@@ -1258,13 +1258,9 @@ static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
1258 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | 1258 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); |
1259 | pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */ | 1259 | pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */ |
1260 | 1260 | ||
1261 | vma->vm_flags |= VM_IO; | ||
1262 | |||
1263 | return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, | 1261 | return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, |
1264 | vma->vm_end - vma->vm_start, | 1262 | vma->vm_end - vma->vm_start, |
1265 | vma->vm_page_prot); | 1263 | vma->vm_page_prot); |
1266 | |||
1267 | return 0; | ||
1268 | } | 1264 | } |
1269 | 1265 | ||
1270 | static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata) | 1266 | static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata) |