diff options
Diffstat (limited to 'drivers/mtd/devices/block2mtd.c')
-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 cfe6ccf07972..e5da82a0dd6f 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c | |||
@@ -1,10 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: block2mtd.c,v 1.23 2005/01/05 17:05:46 dwmw2 Exp $ | 2 | * $Id: block2mtd.c,v 1.25 2005/03/07 20:29:05 joern Exp $ |
3 | * | 3 | * |
4 | * block2mtd.c - create an mtd from a block device | 4 | * block2mtd.c - create an mtd from a block device |
5 | * | 5 | * |
6 | * Copyright (C) 2001,2002 Simon Evans <spse@secret.org.uk> | 6 | * Copyright (C) 2001,2002 Simon Evans <spse@secret.org.uk> |
7 | * Copyright (C) 2004 Gareth Bult <Gareth@Encryptec.net> | ||
8 | * Copyright (C) 2004,2005 Jörn Engel <joern@wh.fh-wedel.de> | 7 | * Copyright (C) 2004,2005 Jörn Engel <joern@wh.fh-wedel.de> |
9 | * | 8 | * |
10 | * Licence: GPL | 9 | * Licence: GPL |
@@ -20,7 +19,7 @@ | |||
20 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
21 | #include <linux/buffer_head.h> | 20 | #include <linux/buffer_head.h> |
22 | 21 | ||
23 | #define VERSION "$Revision: 1.23 $" | 22 | #define VERSION "$Revision: 1.24 $" |
24 | 23 | ||
25 | 24 | ||
26 | #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args) | 25 | #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, | |||
157 | struct block2mtd_dev *dev = mtd->priv; | 156 | struct block2mtd_dev *dev = mtd->priv; |
158 | struct page *page; | 157 | struct page *page; |
159 | int index = from >> PAGE_SHIFT; | 158 | int index = from >> PAGE_SHIFT; |
160 | int offset = from & (PAGE_SHIFT-1); | 159 | int offset = from & (PAGE_SIZE-1); |
161 | int cpylen; | 160 | int cpylen; |
162 | 161 | ||
163 | if (from > mtd->size) | 162 | if (from > mtd->size) |