Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74227
b: refs/heads/master
c: 8a8037a
h: refs/heads/master
i:
  74225: e5a0518
  74223: 4db20cc
v: v3
  • Loading branch information
chas williams authored and Herbert Xu committed Nov 27, 2007
1 parent 6d1ef4e commit 9f1a495
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3660019e5f96fd9a8b7d4214a96523c0bf7b676d
refs/heads/master: 8a8037ac9dbe4eb20ce50aa20244faf77444f4a3
10 changes: 5 additions & 5 deletions trunk/drivers/atm/he.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9f1a495

Please sign in to comment.