patch-2.3.26 linux/drivers/sbus/char/flash.c

• Lines: 18
• Date: Tue Nov 2 17:40:11 1999
• Orig file: v2.3.25/linux/drivers/sbus/char/flash.c
• Orig date: Mon Nov 1 13:56:26 1999

diff -u --recursive --new-file v2.3.25/linux/drivers/sbus/char/flash.c linux/drivers/sbus/char/flash.c
@@ -55,12 +55,13 @@
 			return -ENXIO;
 	}
 
-	if (vma->vm_offset > size)
+	if (vma->vm_pgoff > (size >> PAGE_SHIFT))
 		return -ENXIO;
-	addr += vma->vm_offset;
+	off = vma->vm_pgoff << PAGE_SHIFT;
+	addr += off;
 
-	if (vma->vm_end - (vma->vm_start + vma->vm_offset) > size)
-		size = vma->vm_end - (vma->vm_start + vma->vm_offset);
+	if (vma->vm_end - (vma->vm_start + off) > size)
+		size = vma->vm_end - (vma->vm_start + off);
 
 	pgprot_val(vma->vm_page_prot) &= ~(_PAGE_CACHE);
 	pgprot_val(vma->vm_page_prot) |= _PAGE_E;