Переглянути джерело

[MTD] block2mtd: Remove copyright. Fix offset calculation

- Remove Gareth from the Copyrights (at his own request)
- Fix the "fscking embarrassment"

Signed-off-by: Joern Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Joern Engel 20 роки тому
батько
коміт
711c11b78d
1 змінених файлів з 3 додано та 4 видалено
  1. 3 4
      drivers/mtd/devices/block2mtd.c

+ 3 - 4
drivers/mtd/devices/block2mtd.c

@@ -1,10 +1,9 @@
 /*
 /*
- * $Id: block2mtd.c,v 1.23 2005/01/05 17:05:46 dwmw2 Exp $
+ * $Id: block2mtd.c,v 1.25 2005/03/07 20:29:05 joern Exp $
  *
  *
  * block2mtd.c - create an mtd from a block device
  * block2mtd.c - create an mtd from a block device
  *
  *
  * Copyright (C) 2001,2002	Simon Evans <spse@secret.org.uk>
  * Copyright (C) 2001,2002	Simon Evans <spse@secret.org.uk>
- * Copyright (C) 2004		Gareth Bult <Gareth@Encryptec.net>
  * Copyright (C) 2004,2005	Jörn Engel <joern@wh.fh-wedel.de>
  * Copyright (C) 2004,2005	Jörn Engel <joern@wh.fh-wedel.de>
  *
  *
  * Licence: GPL
  * Licence: GPL
@@ -20,7 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/mtd.h>
 #include <linux/buffer_head.h>
 #include <linux/buffer_head.h>
 
 
-#define VERSION "$Revision: 1.23 $"
+#define VERSION "$Revision: 1.24 $"
 
 
 
 
 #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
 #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
@@ -157,7 +156,7 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len,
 	struct block2mtd_dev *dev = mtd->priv;
 	struct block2mtd_dev *dev = mtd->priv;
 	struct page *page;
 	struct page *page;
 	int index = from >> PAGE_SHIFT;
 	int index = from >> PAGE_SHIFT;
-	int offset = from & (PAGE_SHIFT-1);
+	int offset = from & (PAGE_SIZE-1);
 	int cpylen;
 	int cpylen;
 
 
 	if (from > mtd->size)
 	if (from > mtd->size)