git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
mtd
/
mtdblock.c
diff --git
a/drivers/mtd/mtdblock.c
b/drivers/mtd/mtdblock.c
index
c91d970
..
b7c32c2
100644
(file)
--- a/
drivers/mtd/mtdblock.c
+++ b/
drivers/mtd/mtdblock.c
@@
-1,7
+1,7
@@
/*
* Direct MTD block device access
*
/*
* Direct MTD block device access
*
- * $Id: mtdblock.c,v 1.6
4 2003/10/04 17:14:14 dwmw2
Exp $
+ * $Id: mtdblock.c,v 1.6
6 2004/11/25 13:52:52 joern
Exp $
*
* (C) 2000-2003 Nicolas Pitre <nico@cam.org>
* (C) 1999-2003 David Woodhouse <dwmw2@infradead.org>
*
* (C) 2000-2003 Nicolas Pitre <nico@cam.org>
* (C) 1999-2003 David Woodhouse <dwmw2@infradead.org>
@@
-248,7
+248,7
@@
static int mtdblock_writesect(struct mtd_blktrans_dev *dev,
unsigned long block, char *buf)
{
struct mtdblk_dev *mtdblk = mtdblks[dev->devnum];
unsigned long block, char *buf)
{
struct mtdblk_dev *mtdblk = mtdblks[dev->devnum];
- if (unlikely(!mtdblk->cache_data)) {
+ if (unlikely(!mtdblk->cache_data
&& mtdblk->cache_size
)) {
mtdblk->cache_data = vmalloc(mtdblk->mtd->erasesize);
if (!mtdblk->cache_data)
return -EINTR;
mtdblk->cache_data = vmalloc(mtdblk->mtd->erasesize);
if (!mtdblk->cache_data)
return -EINTR;
@@
-361,7
+361,7
@@
static void mtdblock_remove_dev(struct mtd_blktrans_dev *dev)
kfree(dev);
}
kfree(dev);
}
-struct mtd_blktrans_ops mtdblock_tr = {
+st
atic st
ruct mtd_blktrans_ops mtdblock_tr = {
.name = "mtdblock",
.major = 31,
.part_bits = 0,
.name = "mtdblock",
.major = 31,
.part_bits = 0,
@@
-375,7
+375,7
@@
struct mtd_blktrans_ops mtdblock_tr = {
.owner = THIS_MODULE,
};
.owner = THIS_MODULE,
};
-int __init init_mtdblock(void)
+
static
int __init init_mtdblock(void)
{
return register_mtd_blktrans(&mtdblock_tr);
}
{
return register_mtd_blktrans(&mtdblock_tr);
}