diff options
| author | Joern Engel <joern@wohnheim.fh-wedel.de> | 2005-03-07 20:29:09 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 12:50:11 +0200 |
| commit | 711c11b78d00c0652d38893c558a2bcca55d96d4 (patch) | |
| tree | e4147499131228e5e271d4c769f402c973cb0c68 /drivers/mtd | |
| parent | b4eab4b8d633ff1d65dac5cfb07949489f68ae26 (diff) | |
| download | kernel_samsung_espresso10-711c11b78d00c0652d38893c558a2bcca55d96d4.zip kernel_samsung_espresso10-711c11b78d00c0652d38893c558a2bcca55d96d4.tar.gz kernel_samsung_espresso10-711c11b78d00c0652d38893c558a2bcca55d96d4.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/devices/block2mtd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index cfe6ccf..e5da82a 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/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 * * 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> * * Licence: GPL @@ -20,7 +19,7 @@ #include <linux/mtd/mtd.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) @@ -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 page *page; int index = from >> PAGE_SHIFT; - int offset = from & (PAGE_SHIFT-1); + int offset = from & (PAGE_SIZE-1); int cpylen; if (from > mtd->size) |