From 567fd008fe7455fa315898b727cdca9d2143bd91 Mon Sep 17 00:00:00 2001 From: Adam Belay Date: Fri, 20 Jan 2006 09:29:27 +0100 Subject: [PATCH] --- yaml --- r: 19568 b: refs/heads/master c: d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pnp/card.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e210e752e06d..5f251aa00bc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec80859ed292a55334df68fc2492f1303cf3a0ac +refs/heads/master: d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f diff --git a/trunk/drivers/pnp/card.c b/trunk/drivers/pnp/card.c index 0ecbe4edbec1..aaa568a3806e 100644 --- a/trunk/drivers/pnp/card.c +++ b/trunk/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);