diff options
Diffstat (limited to 'drivers/mtd/devices/phram.c')
-rw-r--r-- | drivers/mtd/devices/phram.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c index 765c0179c8d..e8685ee6c1e 100644 --- a/drivers/mtd/devices/phram.c +++ b/drivers/mtd/devices/phram.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * $Id: phram.c,v 1.14 2005/03/07 21:43:38 joern Exp $ | 2 | * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $ |
3 | * | 3 | * |
4 | * Copyright (c) ???? Jochen Schäuble <psionic@psionic.de> | 4 | * Copyright (c) ???? Jochen Schäuble <psionic@psionic.de> |
5 | * Copyright (c) 2003-2004 Jörn Engel <joern@wh.fh-wedel.de> | 5 | * Copyright (c) 2003-2004 Jörn Engel <joern@wh.fh-wedel.de> |
@@ -41,10 +41,10 @@ static int phram_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
41 | 41 | ||
42 | if (instr->addr + instr->len > mtd->size) | 42 | if (instr->addr + instr->len > mtd->size) |
43 | return -EINVAL; | 43 | return -EINVAL; |
44 | 44 | ||
45 | memset(start + instr->addr, 0xff, instr->len); | 45 | memset(start + instr->addr, 0xff, instr->len); |
46 | 46 | ||
47 | /* This'll catch a few races. Free the thing before returning :) | 47 | /* This'll catch a few races. Free the thing before returning :) |
48 | * I don't feel at all ashamed. This kind of thing is possible anyway | 48 | * I don't feel at all ashamed. This kind of thing is possible anyway |
49 | * with flash, but unlikely. | 49 | * with flash, but unlikely. |
50 | */ | 50 | */ |
@@ -63,7 +63,7 @@ static int phram_point(struct mtd_info *mtd, loff_t from, size_t len, | |||
63 | 63 | ||
64 | if (from + len > mtd->size) | 64 | if (from + len > mtd->size) |
65 | return -EINVAL; | 65 | return -EINVAL; |
66 | 66 | ||
67 | *mtdbuf = start + from; | 67 | *mtdbuf = start + from; |
68 | *retlen = len; | 68 | *retlen = len; |
69 | return 0; | 69 | return 0; |
@@ -84,7 +84,7 @@ static int phram_read(struct mtd_info *mtd, loff_t from, size_t len, | |||
84 | 84 | ||
85 | if (len > mtd->size - from) | 85 | if (len > mtd->size - from) |
86 | len = mtd->size - from; | 86 | len = mtd->size - from; |
87 | 87 | ||
88 | memcpy(buf, start + from, len); | 88 | memcpy(buf, start + from, len); |
89 | 89 | ||
90 | *retlen = len; | 90 | *retlen = len; |
@@ -101,7 +101,7 @@ static int phram_write(struct mtd_info *mtd, loff_t to, size_t len, | |||
101 | 101 | ||
102 | if (len > mtd->size - to) | 102 | if (len > mtd->size - to) |
103 | len = mtd->size - to; | 103 | len = mtd->size - to; |
104 | 104 | ||
105 | memcpy(start + to, buf, len); | 105 | memcpy(start + to, buf, len); |
106 | 106 | ||
107 | *retlen = len; | 107 | *retlen = len; |
@@ -159,7 +159,7 @@ static int register_device(char *name, unsigned long start, unsigned long len) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | list_add_tail(&new->list, &phram_list); | 161 | list_add_tail(&new->list, &phram_list); |
162 | return 0; | 162 | return 0; |
163 | 163 | ||
164 | out2: | 164 | out2: |
165 | iounmap(new->mtd.priv); | 165 | iounmap(new->mtd.priv); |