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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
pcmcia
/
cm4000_cs.c
diff --git
a/drivers/char/pcmcia/cm4000_cs.c
b/drivers/char/pcmcia/cm4000_cs.c
index
eab5394
..
50d20aa
100644
(file)
--- a/
drivers/char/pcmcia/cm4000_cs.c
+++ b/
drivers/char/pcmcia/cm4000_cs.c
@@
-149,12
+149,7
@@
struct cm4000_dev {
#define ZERO_DEV(dev) \
memset(&dev->atr_csum,0, \
sizeof(struct cm4000_dev) - \
#define ZERO_DEV(dev) \
memset(&dev->atr_csum,0, \
sizeof(struct cm4000_dev) - \
- /*link*/ sizeof(struct pcmcia_device *) - \
- /*node*/ sizeof(dev_node_t) - \
- /*atr*/ MAX_ATR*sizeof(char) - \
- /*rbuf*/ 512*sizeof(char) - \
- /*sbuf*/ 512*sizeof(char) - \
- /*queue*/ 4*sizeof(wait_queue_head_t))
+ offsetof(struct cm4000_dev, atr_csum))
static struct pcmcia_device *dev_table[CM4000_MAX_DEV];
static struct class *cmm_class;
static struct pcmcia_device *dev_table[CM4000_MAX_DEV];
static struct class *cmm_class;
@@
-1943,7
+1938,7
@@
static void cm4000_detach(struct pcmcia_device *link)
return;
}
return;
}
-static struct file_operations cm4000_fops = {
+static
const
struct file_operations cm4000_fops = {
.owner = THIS_MODULE,
.read = cmm_read,
.write = cmm_write,
.owner = THIS_MODULE,
.read = cmm_read,
.write = cmm_write,