Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[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 50d20aa..eab5394 100644 (file)
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -149,7 +149,12 @@ struct cm4000_dev {
 #define        ZERO_DEV(dev)                                           \
        memset(&dev->atr_csum,0,                                \
                sizeof(struct cm4000_dev) -                     \
-               offsetof(struct cm4000_dev, atr_csum))
+               /*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))
 
 static struct pcmcia_device *dev_table[CM4000_MAX_DEV];
 static struct class *cmm_class;
@@ -1938,7 +1943,7 @@ static void cm4000_detach(struct pcmcia_device *link)
        return;
 }
 
-static const struct file_operations cm4000_fops = {
+static struct file_operations cm4000_fops = {
        .owner  = THIS_MODULE,
        .read   = cmm_read,
        .write  = cmm_write,