diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 22:08:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 22:08:23 -0800 |
| commit | b4103333d7904310d34de18d85e51e3d74f00a3b (patch) | |
| tree | dd5fff309659f023fd5540896cb2db30562abaa6 /drivers/pnp | |
| parent | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (diff) | |
| parent | 1494a92f4c2b1d5abdaa1f823dd19f797bb137de (diff) | |
| download | linux-b4103333d7904310d34de18d85e51e3d74f00a3b.tar.gz linux-b4103333d7904310d34de18d85e51e3d74f00a3b.tar.bz2 linux-b4103333d7904310d34de18d85e51e3d74f00a3b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/card.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 0ecbe4edbec1..aaa568a3806e 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -363,7 +363,7 @@ static int card_resume(struct pnp_dev *dev) int pnp_register_card_driver(struct pnp_card_driver * drv) { - int count = 0; + int count; struct list_head *pos, *temp; drv->link.name = drv->name; @@ -374,10 +374,15 @@ int pnp_register_card_driver(struct pnp_card_driver * drv) drv->link.suspend = drv->suspend ? card_suspend : NULL; drv->link.resume = drv->resume ? card_resume : NULL; + count = pnp_register_driver(&drv->link); + if (count < 0) + return count; + spin_lock(&pnp_lock); list_add_tail(&drv->global_list, &pnp_card_drivers); spin_unlock(&pnp_lock); - pnp_register_driver(&drv->link); + + count = 0; list_for_each_safe(pos,temp,&pnp_cards){ struct pnp_card *card = list_entry(pos, struct pnp_card, global_list); |