From 9f1a495a3ea7e42a4de43cb10895df5521cd9140 Mon Sep 17 00:00:00 2001 From: chas williams Date: Tue, 27 Nov 2007 11:03:16 +0800 Subject: [PATCH] --- yaml --- r: 74227 b: refs/heads/master c: 8a8037ac9dbe4eb20ce50aa20244faf77444f4a3 h: refs/heads/master i: 74225: e5a0518c1d117adae55fcfa928714ecb390493ce 74223: 4db20cc55fb2d2014a8b79cafd97dde6f584f49a v: v3 --- [refs] | 2 +- trunk/drivers/atm/he.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b445876bb6d2..732e24fb8582 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3660019e5f96fd9a8b7d4214a96523c0bf7b676d +refs/heads/master: 8a8037ac9dbe4eb20ce50aa20244faf77444f4a3 diff --git a/trunk/drivers/atm/he.c b/trunk/drivers/atm/he.c index d33aba6864c2..3b64a99772ea 100644 --- a/trunk/drivers/atm/he.c +++ b/trunk/drivers/atm/he.c @@ -394,6 +394,11 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) he_dev->atm_dev->dev_data = he_dev; atm_dev->dev_data = he_dev; he_dev->number = atm_dev->number; +#ifdef USE_TASKLET + tasklet_init(&he_dev->tasklet, he_tasklet, (unsigned long) he_dev); +#endif + spin_lock_init(&he_dev->global_lock); + if (he_start(atm_dev)) { he_stop(he_dev); err = -ENODEV; @@ -1173,11 +1178,6 @@ he_start(struct atm_dev *dev) if ((err = he_init_irq(he_dev)) != 0) return err; -#ifdef USE_TASKLET - tasklet_init(&he_dev->tasklet, he_tasklet, (unsigned long) he_dev); -#endif - spin_lock_init(&he_dev->global_lock); - /* 4.11 enable pci bus controller state machines */ host_cntl |= (OUTFF_ENB | CMDFF_ENB | QUICK_RD_RETRY | QUICK_WR_RETRY | PERR_INT_ENB);