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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
mtd
/
mtdchar.c
diff --git
a/drivers/mtd/mtdchar.c
b/drivers/mtd/mtdchar.c
index
3db73d8
..
02b93f9
100644
(file)
--- a/
drivers/mtd/mtdchar.c
+++ b/
drivers/mtd/mtdchar.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: mtdchar.c,v 1.6
4 2004/08/09 13:59:46
dwmw2 Exp $
+ * $Id: mtdchar.c,v 1.6
2 2004/07/14 13:20:42
dwmw2 Exp $
*
* Character-device access to raw MTD devices.
*
*
* Character-device access to raw MTD devices.
*
@@
-262,7
+262,7
@@
static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
IOCTL calls for getting device parameters.
======================================================================*/
IOCTL calls for getting device parameters.
======================================================================*/
-static void mtd
char
_erase_callback (struct erase_info *instr)
+static void mtd_erase_callback (struct erase_info *instr)
{
wake_up((wait_queue_head_t *)instr->priv);
}
{
wake_up((wait_queue_head_t *)instr->priv);
}
@@
-336,7
+336,7
@@
static int mtd_ioctl(struct inode *inode, struct file *file,
return -EFAULT;
}
erase->mtd = mtd;
return -EFAULT;
}
erase->mtd = mtd;
- erase->callback = mtd
char
_erase_callback;
+ erase->callback = mtd_erase_callback;
erase->priv = (unsigned long)&waitq;
/*
erase->priv = (unsigned long)&waitq;
/*
@@
-511,6
+511,7
@@
static int mtd_ioctl(struct inode *inode, struct file *file,
}
default:
}
default:
+ DEBUG(MTD_DEBUG_LEVEL0, "Invalid ioctl %x (MEMGETINFO = %x)\n", cmd, MEMGETINFO);
ret = -ENOTTY;
}
ret = -ENOTTY;
}