projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
drivers
/
mtd
/
devices
/
phram.c
diff --git
a/drivers/mtd/devices/phram.c
b/drivers/mtd/devices/phram.c
index
765c017
..
e8685ee
100644
(file)
--- a/
drivers/mtd/devices/phram.c
+++ b/
drivers/mtd/devices/phram.c
@@
-1,5
+1,5
@@
/**
/**
- * $Id: phram.c,v 1.1
4 2005/03/07 21:43:38 joern
Exp $
+ * $Id: phram.c,v 1.1
6 2005/11/07 11:14:25 gleixner
Exp $
*
* Copyright (c) ???? Jochen Schäuble <psionic@psionic.de>
* Copyright (c) 2003-2004 Jörn Engel <joern@wh.fh-wedel.de>
*
* Copyright (c) ???? Jochen Schäuble <psionic@psionic.de>
* 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)
if (instr->addr + instr->len > mtd->size)
return -EINVAL;
if (instr->addr + instr->len > mtd->size)
return -EINVAL;
-
+
memset(start + instr->addr, 0xff, instr->len);
memset(start + instr->addr, 0xff, instr->len);
- /* This'll catch a few races. Free the thing before returning :)
+ /* This'll catch a few races. Free the thing before returning :)
* I don't feel at all ashamed. This kind of thing is possible anyway
* with flash, but unlikely.
*/
* I don't feel at all ashamed. This kind of thing is possible anyway
* with flash, but unlikely.
*/
@@
-63,7
+63,7
@@
static int phram_point(struct mtd_info *mtd, loff_t from, size_t len,
if (from + len > mtd->size)
return -EINVAL;
if (from + len > mtd->size)
return -EINVAL;
-
+
*mtdbuf = start + from;
*retlen = len;
return 0;
*mtdbuf = start + from;
*retlen = len;
return 0;
@@
-84,7
+84,7
@@
static int phram_read(struct mtd_info *mtd, loff_t from, size_t len,
if (len > mtd->size - from)
len = mtd->size - from;
if (len > mtd->size - from)
len = mtd->size - from;
-
+
memcpy(buf, start + from, len);
*retlen = len;
memcpy(buf, start + from, len);
*retlen = len;
@@
-101,7
+101,7
@@
static int phram_write(struct mtd_info *mtd, loff_t to, size_t len,
if (len > mtd->size - to)
len = mtd->size - to;
if (len > mtd->size - to)
len = mtd->size - to;
-
+
memcpy(start + to, buf, len);
*retlen = len;
memcpy(start + to, buf, len);
*retlen = len;
@@
-159,7
+159,7
@@
static int register_device(char *name, unsigned long start, unsigned long len)
}
list_add_tail(&new->list, &phram_list);
}
list_add_tail(&new->list, &phram_list);
- return 0;
+ return 0;
out2:
iounmap(new->mtd.priv);
out2:
iounmap(new->mtd.priv);