git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
pnp
/
card.c
diff --git
a/drivers/pnp/card.c
b/drivers/pnp/card.c
index
bb19c64
..
b68eef2
100644
(file)
--- a/
drivers/pnp/card.c
+++ b/
drivers/pnp/card.c
@@
-47,7
+47,7
@@
static void card_remove(struct pnp_dev * dev)
{
dev->card_link = NULL;
}
{
dev->card_link = NULL;
}
-
+
static void card_remove_first(struct pnp_dev * dev)
{
struct pnp_card_driver * drv = to_pnp_card_driver(dev->driver);
static void card_remove_first(struct pnp_dev * dev)
{
struct pnp_card_driver * drv = to_pnp_card_driver(dev->driver);
@@
-361,7
+361,7
@@
static int card_resume(struct pnp_dev *dev)
int pnp_register_card_driver(struct pnp_card_driver * drv)
{
int pnp_register_card_driver(struct pnp_card_driver * drv)
{
- int
error
;
+ int
count
;
struct list_head *pos, *temp;
drv->link.name = drv->name;
struct list_head *pos, *temp;
drv->link.name = drv->name;
@@
-372,19
+372,21
@@
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;
drv->link.suspend = drv->suspend ? card_suspend : NULL;
drv->link.resume = drv->resume ? card_resume : NULL;
-
error
= pnp_register_driver(&drv->link);
- if (
error
< 0)
- return
error
;
+
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);
spin_lock(&pnp_lock);
list_add_tail(&drv->global_list, &pnp_card_drivers);
spin_unlock(&pnp_lock);
+ count = 0;
+
list_for_each_safe(pos,temp,&pnp_cards){
struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);
list_for_each_safe(pos,temp,&pnp_cards){
struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);
- card_probe(card,drv);
+ c
ount += c
ard_probe(card,drv);
}
}
- return
0
;
+ return
count
;
}
/**
}
/**