diff options
| -rw-r--r-- | drivers/acorn/net/ether3.c | 1 | ||||
| -rw-r--r-- | drivers/atm/idt77252.c | 4 | ||||
| -rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 1 | ||||
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 1 | ||||
| -rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 1 | ||||
| -rw-r--r-- | drivers/cdrom/cm206.c | 1 | ||||
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 1 | ||||
| -rw-r--r-- | drivers/fc4/fc.c | 3 | ||||
| -rw-r--r-- | drivers/ide/legacy/ide-cs.c | 1 |
9 files changed, 11 insertions, 3 deletions
diff --git a/drivers/acorn/net/ether3.c b/drivers/acorn/net/ether3.c index 1300a42e2b03..e14949425351 100644 --- a/drivers/acorn/net/ether3.c +++ b/drivers/acorn/net/ether3.c @@ -855,6 +855,7 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id) } priv = (struct dev_priv *) dev->priv; + init_timer(&priv->timer); /* Reset card... */ diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 633c40bd8e04..e337c9e68ed4 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -2148,9 +2148,9 @@ idt77252_init_est(struct vc_map *vc, int pcr) est->interval = 2; /* XXX: make this configurable */ est->ewma_log = 2; /* XXX: make this configurable */ + init_timer(&est->timer); est->timer.data = (unsigned long)vc; est->timer.function = idt77252_est_timer; - init_timer(&est->timer); est->timer.expires = jiffies + ((HZ / 4) << est->interval); add_timer(&est->timer); @@ -3745,9 +3745,9 @@ idt77252_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) spin_lock_init(&card->cmd_lock); spin_lock_init(&card->tst_lock); + init_timer(&card->tst_timer); card->tst_timer.data = (unsigned long)card; card->tst_timer.function = tst_timer; - init_timer(&card->tst_timer); /* Do the I/O remapping... */ card->membase = (unsigned long) ioremap(membase, 1024); diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 42cc8ac768ee..0eae1c88ac65 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c @@ -849,6 +849,7 @@ dev_link_t *bluecard_attach(void) link = &info->link; link->priv = info; + init_timer(&link->release); link->release.function = &bluecard_release; link->release.data = (u_long)link; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index f37d44b2da4b..e959f7814225 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -643,6 +643,7 @@ dev_link_t *bt3c_attach(void) link = &info->link; link->priv = info; + init_timer(&link->release); link->release.function = &bt3c_release; link->release.data = (u_long)link; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 63de1e3fc4ac..ffcad4245fcf 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c @@ -582,6 +582,7 @@ dev_link_t *dtl1_attach(void) link = &info->link; link->priv = info; + init_timer(&link->release); link->release.function = &dtl1_release; link->release.data = (u_long)link; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index b3e92df07483..adb364c76b6d 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c @@ -1514,6 +1514,7 @@ int __init cm206_init(void) memset(cd, 0, sizeof(*cd)); /* give'm some reasonable value */ cd->sector_last = -1; /* flag no data buffered */ cd->adapter_last = -1; + init_timer(&cd->timer); cd->timer.function = cm206_timeout; cd->max_sectors = (inw(r_data_status) & ds_ram_size) ? 24 : 97; printk(KERN_INFO "%d kB adapter memory available, " diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 311dfccc7c14..312d818f89ad 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -582,6 +582,7 @@ static dev_link_t *mgslpc_attach(void) link->priv = info; /* Initialize the dev_link_t structure */ + init_timer(&link->release); link->release.function = &mgslpc_release; link->release.data = (u_long)link; diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c index 864ba3d4e697..1455de63b5fd 100644 --- a/drivers/fc4/fc.c +++ b/drivers/fc4/fc.c @@ -676,6 +676,7 @@ int fcp_forceoffline(fc_channel *fcchain, int count) l.magic = LSOMAGIC; FCND(("FCP Force Offline for %d channels\n", count)) init_MUTEX_LOCKED(&l.sem); + init_timer(&l.timer); l.timer.function = fcp_login_timeout; l.timer.data = (unsigned long)&l; atomic_set (&l.todo, count); @@ -977,7 +978,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) fc->rst_pkt->eh_state = SCSI_STATE_QUEUED; - + init_timer(&fc->rst_pkt->eh_timeout); fc->rst_pkt->eh_timeout.data = (unsigned long) fc->rst_pkt; fc->rst_pkt->eh_timeout.expires = jiffies + FCP_RESET_TIMEOUT; fc->rst_pkt->eh_timeout.function = (void (*)(unsigned long))fcp_scsi_reset_done; diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 90f4d55ec016..f06536b7f373 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c @@ -134,6 +134,7 @@ static dev_link_t *ide_attach(void) memset(info, 0, sizeof(*info)); link = &info->link; link->priv = info; + init_timer(&link->release); link->release.function = &ide_release; link->release.data = (u_long)link; link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |