Commit 7a3ed3de authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] pcmcia timer initialisation fixes

pcmcia timer initialisation fixes from Anton Blanchard
parent 80e06f8f
...@@ -305,6 +305,7 @@ static dev_link_t *tc574_attach(void) ...@@ -305,6 +305,7 @@ static dev_link_t *tc574_attach(void)
link = &lp->link; dev = &lp->dev; link = &lp->link; dev = &lp->dev;
link->priv = dev->priv = link->irq.Instance = lp; link->priv = dev->priv = link->irq.Instance = lp;
init_timer(&link->release);
link->release.function = &tc574_release; link->release.function = &tc574_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
link->io.NumPorts1 = 32; link->io.NumPorts1 = 32;
......
...@@ -229,6 +229,7 @@ static dev_link_t *tc589_attach(void) ...@@ -229,6 +229,7 @@ static dev_link_t *tc589_attach(void)
link = &lp->link; dev = &lp->dev; link = &lp->link; dev = &lp->dev;
link->priv = dev->priv = link->irq.Instance = lp; link->priv = dev->priv = link->irq.Instance = lp;
init_timer(&link->release);
link->release.function = &tc589_release; link->release.function = &tc589_release;
link->release.data = (unsigned long)link; link->release.data = (unsigned long)link;
link->io.NumPorts1 = 16; link->io.NumPorts1 = 16;
......
...@@ -246,6 +246,7 @@ static dev_link_t *awc_attach(void) ...@@ -246,6 +246,7 @@ static dev_link_t *awc_attach(void)
memset(link->dev, 0, sizeof(struct dev_node_t)); memset(link->dev, 0, sizeof(struct dev_node_t));
init_timer(&link->release);
link->release.function = &awc_release; link->release.function = &awc_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
// link->io.NumPorts1 = 32; // link->io.NumPorts1 = 32;
......
...@@ -203,6 +203,7 @@ static dev_link_t *axnet_attach(void) ...@@ -203,6 +203,7 @@ static dev_link_t *axnet_attach(void)
link = &info->link; dev = &info->dev; link = &info->link; dev = &info->dev;
link->priv = info; link->priv = info;
init_timer(&link->release);
link->release.function = &axnet_release; link->release.function = &axnet_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
......
...@@ -221,6 +221,7 @@ static dev_link_t *com20020_attach(void) ...@@ -221,6 +221,7 @@ static dev_link_t *com20020_attach(void)
memset(link, 0, sizeof(struct dev_link_t)); memset(link, 0, sizeof(struct dev_link_t));
dev->priv = lp; dev->priv = lp;
init_timer(&link->release);
link->release.function = &com20020_release; link->release.function = &com20020_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
...@@ -221,6 +221,7 @@ static dev_link_t *ibmtr_attach(void) ...@@ -221,6 +221,7 @@ static dev_link_t *ibmtr_attach(void)
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
link = &info->link; link->priv = info; link = &info->link; link->priv = info;
init_timer(&link->release);
link->release.function = &ibmtr_release; link->release.function = &ibmtr_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
...@@ -493,6 +493,7 @@ static dev_link_t *nmclan_attach(void) ...@@ -493,6 +493,7 @@ static dev_link_t *nmclan_attach(void)
link = &lp->link; dev = &lp->dev; link = &lp->link; dev = &lp->dev;
link->priv = dev->priv = link->irq.Instance = lp; link->priv = dev->priv = link->irq.Instance = lp;
init_timer(&link->release);
link->release.function = &nmclan_release; link->release.function = &nmclan_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
link->io.NumPorts1 = 32; link->io.NumPorts1 = 32;
......
...@@ -378,6 +378,7 @@ static dev_link_t *ray_attach(void) ...@@ -378,6 +378,7 @@ static dev_link_t *ray_attach(void)
memset(dev, 0, sizeof(struct net_device)); memset(dev, 0, sizeof(struct net_device));
memset(local, 0, sizeof(ray_dev_t)); memset(local, 0, sizeof(ray_dev_t));
init_timer(&link->release);
link->release.function = &ray_release; link->release.function = &ray_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
......
...@@ -632,6 +632,7 @@ xirc2ps_attach(void) ...@@ -632,6 +632,7 @@ xirc2ps_attach(void)
link = &local->link; dev = &local->dev; link = &local->link; dev = &local->dev;
link->priv = dev->priv = local; link->priv = dev->priv = local;
init_timer(&link->release);
link->release.function = &xirc2ps_release; link->release.function = &xirc2ps_release;
link->release.data = (u_long) link; link->release.data = (u_long) link;
......
...@@ -216,6 +216,7 @@ static dev_link_t *airo_attach(void) ...@@ -216,6 +216,7 @@ static dev_link_t *airo_attach(void)
return NULL; return NULL;
} }
memset(link, 0, sizeof(struct dev_link_t)); memset(link, 0, sizeof(struct dev_link_t));
init_timer(&link->release);
link->release.function = &airo_release; link->release.function = &airo_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
......
...@@ -462,6 +462,7 @@ static dev_link_t *netwave_attach(void) ...@@ -462,6 +462,7 @@ static dev_link_t *netwave_attach(void)
memset(priv, 0, sizeof(*priv)); memset(priv, 0, sizeof(*priv));
link = &priv->link; dev = &priv->dev; link = &priv->link; dev = &priv->dev;
link->priv = dev->priv = priv; link->priv = dev->priv = priv;
init_timer(&link->release);
link->release.function = &netwave_release; link->release.function = &netwave_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
......
...@@ -203,6 +203,7 @@ orinoco_cs_attach(void) ...@@ -203,6 +203,7 @@ orinoco_cs_attach(void)
link->priv = dev; link->priv = dev;
/* Initialize the dev_link_t structure */ /* Initialize the dev_link_t structure */
init_timer(&link->release);
link->release.function = &orinoco_cs_release; link->release.function = &orinoco_cs_release;
link->release.data = (u_long) link; link->release.data = (u_long) link;
......
...@@ -134,6 +134,7 @@ static dev_link_t *parport_attach(void) ...@@ -134,6 +134,7 @@ static dev_link_t *parport_attach(void)
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
link = &info->link; link->priv = info; link = &info->link; link->priv = info;
init_timer(&link->release);
link->release.function = &parport_cs_release; link->release.function = &parport_cs_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
...@@ -142,6 +142,7 @@ static dev_link_t *aha152x_attach(void) ...@@ -142,6 +142,7 @@ static dev_link_t *aha152x_attach(void)
if (!info) return NULL; if (!info) return NULL;
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
link = &info->link; link->priv = info; link = &info->link; link->priv = info;
init_timer(&link->release);
link->release.function = &aha152x_release_cs; link->release.function = &aha152x_release_cs;
link->release.data = (u_long)link; link->release.data = (u_long)link;
......
...@@ -122,6 +122,7 @@ static dev_link_t *fdomain_attach(void) ...@@ -122,6 +122,7 @@ static dev_link_t *fdomain_attach(void)
if (!info) return NULL; if (!info) return NULL;
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
link = &info->link; link->priv = info; link = &info->link; link->priv = info;
init_timer(&link->release);
link->release.function = &fdomain_release; link->release.function = &fdomain_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
......
...@@ -126,6 +126,7 @@ static dev_link_t *qlogic_attach(void) ...@@ -126,6 +126,7 @@ static dev_link_t *qlogic_attach(void)
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
link = &info->link; link = &info->link;
link->priv = info; link->priv = info;
init_timer(&link->release);
link->release.function = &qlogic_release; link->release.function = &qlogic_release;
link->release.data = (u_long) link; link->release.data = (u_long) link;
......
...@@ -63,6 +63,7 @@ static dev_link_t *ixj_attach(void) ...@@ -63,6 +63,7 @@ static dev_link_t *ixj_attach(void)
if (!link) if (!link)
return NULL; return NULL;
memset(link, 0, sizeof(struct dev_link_t)); memset(link, 0, sizeof(struct dev_link_t));
init_timer(&link->release);
link->release.function = &ixj_cs_release; link->release.function = &ixj_cs_release;
link->release.data = (u_long) link; link->release.data = (u_long) link;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment